From 4e9042b6859a431fc2d66c54f183da0b3fe3cfea Mon Sep 17 00:00:00 2001 From: DarkWyrm Date: Wed, 19 Jan 2005 17:35:17 +0000 Subject: [PATCH] Fix build Remove a NULL pointer reference in debug code git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10883 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/server/Jamfile | 2 +- src/servers/app/server/ServerWindow.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/servers/app/server/Jamfile b/src/servers/app/server/Jamfile index 442162f575..aaae0850f0 100644 --- a/src/servers/app/server/Jamfile +++ b/src/servers/app/server/Jamfile @@ -78,6 +78,6 @@ LINKFLAGS on app_server += -lbe ; LinkSharedOSLibs app_server : root game translation libz.so libpng.so libappserver.so libopenbeos.so - libfreetype.so ; + libfreetype.so ; SubInclude OBOS_TOP src servers app server fonts ; diff --git a/src/servers/app/server/ServerWindow.cpp b/src/servers/app/server/ServerWindow.cpp index 73a8041d74..ef8860e089 100644 --- a/src/servers/app/server/ServerWindow.cpp +++ b/src/servers/app/server/ServerWindow.cpp @@ -686,7 +686,7 @@ void ServerWindow::DispatchMessage(int32 code, LinkMsgReader &link) { if (cl == NULL && code != AS_LAYER_CREATE_ROOT) { - printf("ServerWindow %s received unexpected code - message offset %lx before top_view attached.\n",fTitle.String(), code - SERVER_TRUE); + printf("ServerWindow %s received unexpected code - message offset %ld before top_view attached.\n",fTitle.String(), code - SERVER_TRUE); return; } @@ -808,7 +808,8 @@ void ServerWindow::DispatchMessage(int32 code, LinkMsgReader &link) case AS_LAYER_CREATE_ROOT: { - STRACE(("ServerWindow %s: Message AS_LAYER_CREATE_ROOT: Layer name: %s\n", fTitle.String(), cl->fName->String())); + STRACE(("ServerWindow %s: Message AS_LAYER_CREATE_ROOT\n", fTitle.String())); + // Start receiving top_view data -- pass NULL as the parent view. // This should be the *only* place where this happens. if (cl != NULL)