Second Life viewer sources 1.19.0.2

1 files changed, 3 insertions, 3 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 07aefad..2e7e609 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1080,7 +1080,7 @@ BOOL idle_startup()
                         gAcceptTOS,
                         gAcceptCriticalMessage,
                         gViewerDigest,
-                        gLastExecFroze,
+                        gLastExecEvent,
                         requested_options,
                         hashed_mac_string,
                         LLAppViewer::instance()->getSerialNumber());
@@ -2887,8 +2887,8 @@ void update_dialog_callback(S32 option, void *userdata)
 
         llinfos << "Calling updater: " << update_exe_path << " " << params.str() << llendl;
 
-        // *REMOVE:Mani The following call is handled through ~LLAppViewer.
-        // remove_marker_file(); // In case updater fails
+        //Explicitly remove the marker file, otherwise we pass the lock onto the child process and things get weird.
+        LLAppViewer::instance()->removeMarkerFile(); // In case updater fails
         
         // Use spawn() to run asynchronously
         int retval = _spawnl(_P_NOWAIT, update_exe_path.c_str(), update_exe_path.c_str(), params.str().c_str(), NULL);