[haiku-commits] r39978 - haiku/trunk/src/servers/app
- From: mmlr@xxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 28 Dec 2010 13:55:19 +0100 (CET)
Author: mmlr
Date: 2010-12-28 13:55:19 +0100 (Tue, 28 Dec 2010)
New Revision: 39978
Changeset: http://dev.haiku-os.org/changeset/39978
Modified:
haiku/trunk/src/servers/app/Desktop.cpp
Log:
CID 2502: Check the FindMessage return which also safes a needless FindRect call
in the error case.
Modified: haiku/trunk/src/servers/app/Desktop.cpp
===================================================================
--- haiku/trunk/src/servers/app/Desktop.cpp 2010-12-28 12:47:22 UTC (rev
39977)
+++ haiku/trunk/src/servers/app/Desktop.cpp 2010-12-28 12:55:19 UTC (rev
39978)
@@ -952,10 +952,13 @@
frame = fVirtualScreen.Frame();
else if (index >= 0 && index < fSettings->WorkspacesCount()) {
BMessage screenData;
- fSettings->WorkspacesMessage(index)->FindMessage("screen",
&screenData);
- if (screenData.FindRect("frame", &frame) != B_OK)
+ if (fSettings->WorkspacesMessage(index)->FindMessage("screen",
+ &screenData) != B_OK
+ || screenData.FindRect("frame", &frame) != B_OK) {
frame = fVirtualScreen.Frame();
+ }
}
+
return frame;
}
Other related posts:
- » [haiku-commits] r39978 - haiku/trunk/src/servers/app - mmlr
