Changeset 547 for trunk/src/kernel32/profile.cpp

Timestamp:

Aug 18, 1999, 6:44:45 PM (26 years ago)

Author:

phaller

Message:

Fix: Christoph Bratschi's Profile Fix for flushing the profiles

File:

• trunk/src/kernel32/profile.cpp (modified) (7 diffs)

trunk/src/kernel32/profile.cpp

@@ -1 @@
-/* $Id: profile.cpp,v 1.13 1999-08-18 10:56:53 sandervl Exp $ */
+/* $Id: profile.cpp,v 1.14 1999-08-18 16:44:45 phaller Exp $ */
 
 /*
@@ -158 +158 @@
     for ( ; section; section = section->next)
     {
-        if (section->name) fprintf( file, "\n[%s]\n", section->name );
+        if (section->name) fprintf( file, "\r\n[%s]\r\n", section->name );
         for (key = section->key; key; key = key->next)
         {
             fprintf( file, "%s", key->name );
             if (key->value) fprintf( file, "=%s", key->value );
-            fprintf( file, "\n" );
+            fprintf( file, "\r\n" );
         }
     }
@@ -506 +506 @@
     /* check for path */
 
-    if ((!strchr( filename,'/') &&
-        !strchr( filename,'\\')) ||
+    if (!strchr( filename,'/') ||
+        !strchr( filename,'\\') ||
         !strchr( filename,':'))
     {
@@ -905 +905 @@
             PROFILE_WineProfile = PROFILE_Load( f );
             fclose( f );
-            strncpy(PROFILE_WineIniUsed,buffer,MAX_PATHNAME_LEN-1);
+       strncpy(PROFILE_WineIniUsed,buffer,MAX_PATHNAME_LEN-1);
             return 1;
         }
@@ -1177 +1177 @@
     BOOL ret = FALSE;
 
-    dprintf(("WritePrivateProfileStringA: %s %s %s", section, entry, string));
     EnterCriticalSection( &PROFILE_CritSect );
 
@@ -1399 +1398 @@
     INT x;
 
-    dprintf(("WriteOutProfiles"));
     EnterCriticalSection(&PROFILE_CritSect);
-    PROFILE_FlushFile(); //flash current
-    lastCurProfile = CurProfile;
-    for(x = 1;x < N_CACHED_PROFILES;x++)
-    {
-      if (MRUProfile[x])
+    if (MRUProfile && CurProfile->filename)
+    {
+      PROFILE_FlushFile(); //flash current
+      lastCurProfile = CurProfile;
+      for(x = 1;x < N_CACHED_PROFILES;x++)
+      {
         if (MRUProfile[x]->filename)
         {
@@ -1411 +1410 @@
           PROFILE_FlushFile();
         }
-    }
-    CurProfile = lastCurProfile;
+      }
+      CurProfile = lastCurProfile;
+    }
     LeaveCriticalSection(&PROFILE_CritSect);
 }
 
+