From 52bc210d99b2515444ab8f87d3ff892a0e527935 Mon Sep 17 00:00:00 2001 From: Karsten Heimrich Date: Sun, 29 Mar 2009 20:29:53 +0000 Subject: [PATCH] * add flurry to the image * seems we hit a race during shutdown, thus the BGLView would already be delete by unload_add_on, crashing the screenblanker (tested with several GL saver) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29793 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 2 +- src/bin/screen_blanker/ScreenBlanker.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 6e042f30b6..9530ed276b 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -118,7 +118,7 @@ BEOS_ADD_ONS_PRINT = Canon\ LIPS3\ Compatible Canon\ LIPS4\ Compatible BEOS_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port Print\ To\ File Serial\ Port USB\ Port ; -BEOS_ADD_ONS_SCREENSAVERS = DebugNow Haiku IFS Spider Message ; +BEOS_ADD_ONS_SCREENSAVERS = DebugNow Flurry Haiku IFS Spider Message ; BEOS_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki ; #hda BEOS_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ; BEOS_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia diff --git a/src/bin/screen_blanker/ScreenBlanker.cpp b/src/bin/screen_blanker/ScreenBlanker.cpp index 5463e9ba75..3ac9a87fe7 100644 --- a/src/bin/screen_blanker/ScreenBlanker.cpp +++ b/src/bin/screen_blanker/ScreenBlanker.cpp @@ -278,14 +278,14 @@ ScreenBlanker::QuitRequested() void ScreenBlanker::_Shutdown() { - delete fRunner; - if (fWindow) { fWindow->Hide(); if (fWindow->Lock()) fWindow->Quit(); } + + delete fRunner; }