Fixed lacking return entry

Haivision · Jan 13, 2025 · 9852ae1 · 9852ae1
1 parent 2116963
commit 9852ae1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/srtcore/api.cpp b/srtcore/api.cpp
@@ -237,7 +237,8 @@ int srt::CUDTUnited::startup(bool implicit)
         return 1;
 
     if (m_iInstanceCount++ > 0)
-        return m_iInstanceCount;
+        // [reinstate in 1.6.0] return m_iInstanceCount;
+        return 1;
 
     if (m_bGCStatus)
         // [reinstate in 1.6.0] return m_iInstanceCount;

diff --git a/test/test_common.cpp b/test/test_common.cpp
@@ -18,7 +18,9 @@ TEST(General, Startup)
     EXPECT_EQ(srt::CUDT::uglobal().getInstanceStatus(), std::make_pair(1, true));
 
     // Every next one should return the number of nested instances
-    EXPECT_EQ(srt_startup(), 2);
+    // [reinstate in 1.6.0] EXPECT_EQ(srt_startup(), 2);
+    srt_startup();
+    EXPECT_EQ(srt::CUDT::uglobal().getInstanceStatus(), std::make_pair(2, true));
 
     // Now let's pair the first instance, should NOT execute
     // [reinstate in 1.6.0] EXPECT_EQ(srt_cleanup(), 1);