Work-around to make broken apps like 3dmix work - patch submitted by genki-at-bredband.net:
* we no longer drop into the debugger if BScreen is used without an app_server link. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16229 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2002-2005, Haiku Inc.
|
* Copyright 2002-2006, Haiku Inc.
|
||||||
* Distributed under the terms of the MIT License.
|
* Distributed under the terms of the MIT License.
|
||||||
*
|
*
|
||||||
* Authors:
|
* Authors:
|
||||||
@@ -7,9 +7,10 @@
|
|||||||
* Axel Dörfler, [email protected]
|
* Axel Dörfler, [email protected]
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/** BPrivateScreen is the class which does the real work for
|
/*!
|
||||||
* the proxy class BScreen (it interacts with the app server).
|
BPrivateScreen is the class which does the real work for
|
||||||
*/
|
the proxy class BScreen (it interacts with the app_server).
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "AppMisc.h"
|
#include "AppMisc.h"
|
||||||
@@ -17,6 +18,7 @@
|
|||||||
#include "PrivateScreen.h"
|
#include "PrivateScreen.h"
|
||||||
#include "ServerProtocol.h"
|
#include "ServerProtocol.h"
|
||||||
|
|
||||||
|
#include <Application.h>
|
||||||
#include <Autolock.h>
|
#include <Autolock.h>
|
||||||
#include <Bitmap.h>
|
#include <Bitmap.h>
|
||||||
#include <Locker.h>
|
#include <Locker.h>
|
||||||
@@ -65,6 +67,10 @@ BPrivateScreen::Get(screen_id id)
|
|||||||
BPrivateScreen *
|
BPrivateScreen *
|
||||||
BPrivateScreen::_Get(screen_id id, bool check)
|
BPrivateScreen::_Get(screen_id id, bool check)
|
||||||
{
|
{
|
||||||
|
// Nothing works without an app_server connection
|
||||||
|
if (be_app == NULL)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
BAutolock locker(sScreenLock);
|
BAutolock locker(sScreenLock);
|
||||||
|
|
||||||
// search for the screen ID
|
// search for the screen ID
|
||||||
|
|||||||
Reference in New Issue
Block a user