Browse Source

Cleanup based on feedback.

Shaddock Heath 8 years ago
parent
commit
9633a3516b

+ 0 - 2
Source/AtomicApp/Player/IPCPlayerApp.cpp

@@ -200,7 +200,6 @@ namespace Atomic
         {
         {
             ATOMIC_LOGDEBUG("Starting JSDebugger Subsystem");
             ATOMIC_LOGDEBUG("Starting JSDebugger Subsystem");
             context_->RegisterSubsystem(new JSDebugger(context_));
             context_->RegisterSubsystem(new JSDebugger(context_));
-            context_->GetSubsystem<JSDebugger>()->AutoReconnect = true;
             context_->GetSubsystem<JSDebugger>()->Reconnect();
             context_->GetSubsystem<JSDebugger>()->Reconnect();
         }
         }
 
 
@@ -215,7 +214,6 @@ namespace Atomic
     {
     {
         if (debugPlayer_)
         if (debugPlayer_)
         {
         {
-            context_->GetSubsystem<JSDebugger>()->AutoReconnect = false;
             context_->GetSubsystem<JSDebugger>()->Shutdown();
             context_->GetSubsystem<JSDebugger>()->Shutdown();
         }
         }
 
 

+ 11 - 5
Source/AtomicJS/Javascript/JSDebugger.cpp

@@ -18,20 +18,25 @@ namespace Atomic
 
 
 JSDebugger* JSDebugger::instance_ = NULL;
 JSDebugger* JSDebugger::instance_ = NULL;
 
 
-JSDebugger::JSDebugger(Context* context) : Object(context)
+JSDebugger::JSDebugger(Context* context) :
+    Object(context),
+    autoReconnect_(true)
 {
 {
     instance_ = this;
     instance_ = this;
-    this->AutoReconnect = false;
 }
 }
 
 
 JSDebugger::~JSDebugger()
 JSDebugger::~JSDebugger()
 {
 {
+    duk_trans_socket_finish();
     instance_ = NULL;
     instance_ = NULL;
 }
 }
 
 
 void JSDebugger::Shutdown() const
 void JSDebugger::Shutdown() const
 {
 {
-    duk_trans_socket_finish();
+    if (Atomic::JSDebugger::GetInstance())
+    {
+        Atomic::JSDebugger::GetInstance()->SetAutoReconnect(false);
+    }
 }
 }
 
 
 void JSDebugger::Reconnect() const
 void JSDebugger::Reconnect() const
@@ -68,9 +73,10 @@ void JSDebugger::Reconnect() const
 
 
 static void do_reconnect()
 static void do_reconnect()
 {
 {
-    if (Atomic::JSDebugger::GetInstance() && Atomic::JSDebugger::GetInstance()->AutoReconnect)
+    Atomic::JSDebugger* dbg = Atomic::JSDebugger::GetInstance();
+    if (dbg && dbg->GetAutoReconnect())
     {
     {
-        Atomic::JSDebugger::GetInstance()->Reconnect();
+        dbg->Reconnect();
     }
     }
 }
 }
 
 

+ 7 - 2
Source/AtomicJS/Javascript/JSDebugger.h

@@ -51,12 +51,17 @@ public:
     /// Get the JSDebugger subsystem from external code
     /// Get the JSDebugger subsystem from external code
     static JSDebugger* GetInstance() { return instance_; }
     static JSDebugger* GetInstance() { return instance_; }
 
 
-    /// Automatically listen for a new connection when disconnected
-    bool AutoReconnect;
+    /// Set the Auto Reconnect value
+    void SetAutoReconnect(bool value) { autoReconnect_ = value; }
+
+    /// Get the Auto Reconnect value
+    bool GetAutoReconnect() { return autoReconnect_; }
+
 
 
 private:
 private:
 
 
     static JSDebugger* instance_;
     static JSDebugger* instance_;
+    bool autoReconnect_;
 
 
 };
 };