From 96d45e72379768e3d03aa5615cd3610ae7d39b77 Mon Sep 17 00:00:00 2001
From: electron128 <unknown@unknown.com>
Date: Wed, 6 May 2015 18:17:02 +0000
Subject: [PATCH] fixed crash in rs-gui when stopping webui

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8220 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libresapi/src/api/RsControlModule.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libresapi/src/api/RsControlModule.cpp b/libresapi/src/api/RsControlModule.cpp
index 31d8c3518..a38a6b5f0 100644
--- a/libresapi/src/api/RsControlModule.cpp
+++ b/libresapi/src/api/RsControlModule.cpp
@@ -43,7 +43,8 @@ RsControlModule::RsControlModule(int argc, char **argv, StateTokenServer* sts, A
 
 RsControlModule::~RsControlModule()
 {
-    join();
+    if(isRunning())
+        join();
 }
 
 bool RsControlModule::processShouldExit()