[Sc2-cvs] SF.net SVN: sc2:[3767] trunk/sc2/src

[<av...@us...>]

Revision: 3767
          http://sc2.svn.sourceforge.net/sc2/?rev=3767&view=rev
Author:   avolkov
Date:     2012-02-12 20:18:33 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Cleanup mounted dirs upon exit; bug #1149; thanks to Louis Delacroix

Modified Paths:
--------------
    trunk/sc2/src/options.c
    trunk/sc2/src/options.h
    trunk/sc2/src/uqm.c

Modified: trunk/sc2/src/options.c
===================================================================
--- trunk/sc2/src/options.c	2012-02-12 20:01:20 UTC (rev 3766)
+++ trunk/sc2/src/options.c	2012-02-12 20:18:33 UTC (rev 3767)
@@ -603,6 +603,31 @@
 	}
 }
 
+void
+unprepareAllDirs (void)
+{
+	if (saveDir)
+	{
+		uio_closeDir (saveDir);
+		saveDir = 0;
+	}
+	if (meleeDir)
+	{
+		uio_closeDir (meleeDir);
+		meleeDir = 0;
+	}
+	if (contentDir)
+	{
+		uio_closeDir (contentDir);
+		contentDir = 0;
+	}
+	if (configDir)
+	{
+		uio_closeDir (configDir);
+		configDir = 0;
+	}
+}
+
 bool
 setGammaCorrection (float gamma)
 {

Modified: trunk/sc2/src/options.h
===================================================================
--- trunk/sc2/src/options.h	2012-02-12 20:01:20 UTC (rev 3766)
+++ trunk/sc2/src/options.h	2012-02-12 20:18:33 UTC (rev 3767)
@@ -79,6 +79,7 @@
 void prepareSaveDir (void);
 void prepareAddons (const char **addons);
 void prepareShadowAddons (const char **addons);
+void unprepareAllDirs (void);
 
 BOOLEAN loadAddon (const char *addon);
 int loadIndices (uio_DirHandle *baseDir);

Modified: trunk/sc2/src/uqm.c
===================================================================
--- trunk/sc2/src/uqm.c	2012-02-12 20:01:20 UTC (rev 3766)
+++ trunk/sc2/src/uqm.c	2012-02-12 20:18:33 UTC (rev 3767)
@@ -486,6 +486,7 @@
 #if 0
 		unInitTempDir ();
 #endif
+		unprepareAllDirs ();
 		uninitIO ();
 		UnInitThreadSystem ();
 		mem_uninit ();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.