1 files changed, 5 insertions, 0 deletions
diff --git a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp
index becadead55f..93985a76a52 100644
--- a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp
+++ b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp
@@ -387,6 +387,7 @@ public:
         try
         {
             clientRunable->waitForCompleted();
+			clientRunable->getThreadControl().detach();
         }
         catch(...)
         {
@@ -394,6 +395,7 @@ public:
             {
                 serverRunable->shutdown();
                 serverRunable->waitForCompleted();
+				serverRunable->getThreadControl().detach();
             }
             throw;
         }
@@ -401,6 +403,7 @@ public:
         if(serverRunable)
         {
             serverRunable->waitForCompleted();
+			serverRunable->getThreadControl().detach();
         }
     }
 
@@ -412,6 +415,7 @@ public:
         RunnablePtr clientRunable = new Runnable(_test.prefix + client, cltConfig);
         clientRunable->start();
         clientRunable->waitForCompleted();
+		clientRunable->getThreadControl().detach();
     }
     
 private:
@@ -509,4 +513,5 @@ MainPage::runSelectedTest()
 
     TestRunnerPtr t = new TestRunner(allTest[TestList->SelectedIndex], config);
     t->start();
+	t->getThreadControl().detach();
 }