[haiku-commits] r42496 - haiku/trunk/src/servers/app

Author: czeidler
Date: 2011-07-26 08:49:16 +0200 (Tue, 26 Jul 2011)
New Revision: 42496
Changeset: https://dev.haiku-os.org/changeset/42496

Modified:
   haiku/trunk/src/servers/app/MessageLooper.cpp
   haiku/trunk/src/servers/app/Workspace.cpp
Log:
Assert the right lock, thanks Axel. Some clean up.



Modified: haiku/trunk/src/servers/app/MessageLooper.cpp
===================================================================
--- haiku/trunk/src/servers/app/MessageLooper.cpp       2011-07-26 06:34:34 UTC 
(rev 42495)
+++ haiku/trunk/src/servers/app/MessageLooper.cpp       2011-07-26 06:49:16 UTC 
(rev 42496)
@@ -9,13 +9,15 @@
 
 #include "MessageLooper.h"
 
-#include <Autolock.h>
 #include <stdio.h>
 #include <string.h>
 
+#include <Autolock.h>
 
+
 MessageLooper::MessageLooper(const char* name)
-       : BLocker(name),
+       :
+       BLocker(name),
        fThread(-1),
        fQuitting(false),
        fDeathSemaphore(-1)

Modified: haiku/trunk/src/servers/app/Workspace.cpp
===================================================================
--- haiku/trunk/src/servers/app/Workspace.cpp   2011-07-26 06:34:34 UTC (rev 
42495)
+++ haiku/trunk/src/servers/app/Workspace.cpp   2011-07-26 06:49:16 UTC (rev 
42496)
@@ -7,16 +7,19 @@
  */
 
 
-#include "Desktop.h"
 #include "Workspace.h"
-#include "WorkspacePrivate.h"
-#include "Window.h"
 
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <Debug.h>
 
+#include "Desktop.h"
+#include "WorkspacePrivate.h"
+#include "Window.h"
+
+
 static rgb_color kDefaultColor = (rgb_color){ 51, 102, 152, 255 };
 
 
@@ -82,6 +85,7 @@
        fDesktop(desktop),
        fCurrentWorkspace(index == desktop.CurrentWorkspace())
 {
+       ASSERT(desktop.IsLocked());
        RewindWindows();
 }
 


Other related posts: