#5084 Improve watchdog's behavior #2

2 files changed, 7 insertions, 4 deletions

diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h
index fef7dc80b3..3a855bc480 100644
--- a/indra/llcommon/llapp.h
+++ b/indra/llcommon/llapp.h
@@ -285,7 +285,7 @@ public:
 
 #ifdef LL_WINDOWS
     virtual bool reportCrashToBugsplat(void* pExcepInfo /*EXCEPTION_POINTERS*/) { return false; }
-    virtual bool reportCustomToBugsplat(const std::string& desription) { return false; }
+    virtual bool reportCustomToBugsplat(const std::string& description) { return false; }
 #endif
 
 public:
diff --git a/indra/llcommon/llwatchdog.cpp b/indra/llcommon/llwatchdog.cpp
index 1622aeb180..66b565c763 100644
--- a/indra/llcommon/llwatchdog.cpp
+++ b/indra/llcommon/llwatchdog.cpp
@@ -191,6 +191,7 @@ void LLWatchdog::remove(LLWatchdogEntry* e)
 {
     lockThread();
     mSuspects.erase(e);
+    mFrozeList.erase(e);
     unlockThread();
 }
 
@@ -284,8 +285,9 @@ void LLWatchdog::run()
                 // Sets watchdog marker file
                 mCreateMarkerFnc(false);
                 // If it's mainloop and it somehow recovers, it will re-add itself
-                mSuspects.erase(*result);
-                mFrozeList.insert(*result);
+                LLWatchdogEntry* froze_entry = *result;
+                mSuspects.erase(result);
+                mFrozeList.insert(froze_entry);
                 LL_WARNS() << description << LL_ENDL;
             }
             else
@@ -307,8 +309,9 @@ void LLWatchdog::run()
                     mCreateMarkerFnc(false);
                     // Already reported, don't report again.
                     // If it's mainloop and it somehow recovers, it will re-add itself
+                    LLWatchdogEntry* froze_entry = *result;
                     mSuspects.erase(result);
-                    mFrozeList.insert(*result);
+                    mFrozeList.insert(froze_entry);
                 }
             }
         }