Changeset 16537 for trunk

Timestamp:

06/01/13 12:03:09 (11 years ago)

Author:

tbretz

Message:

Only wait if this is a valid server, e.g. dimctrl is not.

File:

• trunk/FACT++/src/StateMachineDim.h (modified) (2 diffs)

trunk/FACT++/src/StateMachineDim.h

@@ -32 +32 @@
 class DimStart : public DimErrorRedirecter
 {
+    const bool fIsValidServer;
+
 protected:
-    DimStart(const std::string &name, MessageImp &imp) : DimErrorRedirecter(imp)
+    DimStart(const std::string &name, MessageImp &imp) : DimErrorRedirecter(imp), fIsValidServer(!name.empty())
     {
         DimClient::setNoDataCopy();
-        if (!name.empty())
+        if (fIsValidServer)
         {
             DimServer::start(name.c_str());
@@ -47 +49 @@
     ~DimStart()
     {
+        if (!fIsValidServer)
+            return;
+
         // Give some time for pending log messages to be
         // transmitted before the network is stopped