Changeset 19051

Timestamp:

10/12/06 08:34:19 (2 years ago)

Author:

axeld

Message:

We must not have the font manager locked when locking the desktop (no matter
if read or write); there are some methods that cause a locking of the font
manager (like ServerFont::SetFamilyAndStyle()).
This fixes bug #885.

Location:

haiku/trunk/src/servers/app

Files:

• ServerApp.cpp (modified) (3 diffs)
• ServerFont.cpp (modified) (1 diff)

haiku/trunk/src/servers/app/ServerApp.cpp

@@ -1043 +1043 @@
                         //      3) string - style
                         //      4) float - size
-                        
+
                         char type[B_OS_NAME_LENGTH];
                         font_family familyName;
@@ -1053 +1053 @@
                                 && link.ReadString(styleName, sizeof(styleName)) == B_OK
                                 && link.Read<float>(&size) == B_OK) {
-                                BAutolock locker(gFontManager);
+                                gFontManager->Lock();
 
                                 FontStyle* style = gFontManager->GetStyle(familyName, styleName);
                                 if (style != NULL) {
                                         ServerFont font(*style, size);
+                                        gFontManager->Unlock();
+                                                // We must not have locked the font manager when
+                                                // locking the desktop (through LockedDesktopSettings
+                                                // below)
+
                                         LockedDesktopSettings settings(fDesktop);
 
@@ -1066 +1071 @@
                                         else if (!strcmp(type, "fixed"))
                                                 settings.SetDefaultFixedFont(font);
-                                }
+                                } else
+                                        gFontManager->Unlock();
                         }
                         break;

haiku/trunk/src/servers/app/ServerFont.cpp

@@ -241 +241 @@
 /*!
         \brief Sets the ServerFont instance to whatever font is specified
+        This method will lock the font manager.
+
         \param familyID ID number of the family to set
         \param styleID ID number of the style to set