Second Life viewer sources 1.18.1.2

1 files changed, 6 insertions, 3 deletions

diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp
index a30f024..659fbf4a 100644
--- a/linden/indra/mac_updater/mac_updater.cpp
+++ b/linden/indra/mac_updater/mac_updater.cpp
@@ -991,10 +991,12 @@ void *updatethreadproc(void*)
                         if(len < sizeof(temp)-1)
                         {
                                 // End of file or error.
-                                if(pclose(mounter) != 0)
+                                int result = pclose(mounter);
+                                if(result != 0)
                                 {
-                                        llinfos << "Failed to mount disk image, exiting."<< llendl;
-                                        throw 0;
+                                        // NOTE: We used to abort here, but pclose() started returning 
+                                        // -1, possibly when the size of the DMG passed a certain point 
+                                        llinfos << "Unexpected result closing pipe: " << result << llendl; 
                                 }
                                 mounter = NULL;
                         }
@@ -1020,6 +1022,7 @@ void *updatethreadproc(void*)
                 else
                 {
                         llinfos << "Disk image device node not found!" << llendl;
+                        throw 0; 
                 }
                 
                 // Get an FSRef to the new application on the disk image