Merge branch 'master' into development/portable-build

rdkcentral · Jul 3, 2024 · 9f1d712 · 9f1d712
2 parents 6b895c7 + 7f048da
commit 9f1d712
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/Source/core/SocketPort.cpp b/Source/core/SocketPort.cpp
@@ -63,14 +63,14 @@
 #define __ERROR_CONNRESET__ WSAECONNRESET
 #define __ERROR_NETWORK_UNREACHABLE__ WSAENETUNREACH
 PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST)
-#else
+#endif
 
 #ifdef __APPLE__
 #define IPV6_PACKAGE_TYPE IPV6_RECVPKTINFO
 #else
 #define IPV6_PACKAGE_TYPE IPV6_PKTINFO
 #endif
-#endif
+
 
 namespace Thunder {
     namespace Core {

diff --git a/Source/core/Thread.cpp b/Source/core/Thread.cpp
@@ -74,10 +74,6 @@ namespace Core {
         // then it is up to us.
         if (m_hThreadInstance == nullptr)
 #endif
-        std::string convertedName;
-        if (threadName != nullptr) {
-            Core::ToString(threadName, convertedName);
-        }
 
 #ifdef __POSIX__
             int err;
@@ -93,7 +89,6 @@ namespace Core {
             ASSERT(err == 0);
         }
 
-        m_threadName = convertedName;
         // If there is no thread, the "new" thread can also not free the destructor,
         // then it is up to us.
 
@@ -105,10 +100,16 @@ namespace Core {
             m_sigExit.SetEvent();
         }
 
+        std::string convertedName;
+        if (threadName != nullptr) {
+            Core::ToString(threadName, convertedName);
+        }
+
 #ifdef __POSIX__
         err = pthread_attr_destroy(&attr);
         ASSERT(err == 0);
         m_ThreadId = m_hThreadInstance;
+        m_threadName = convertedName;
 #else
         if (convertedName.empty() != true) {
             ThreadName(convertedName.c_str());