Author: korli Date: 2010-06-06 16:02:42 +0200 (Sun, 06 Jun 2010) New Revision: 37034 Changeset: http://dev.haiku-os.org/changeset/37034/haiku Modified: haiku/trunk/src/preferences/screensaver/PreviewView.cpp Log: * sets fSaverView in RemovePreview() to NULL, thus avoiding a crash in ModulesView::_CloseSaver(). Modified: haiku/trunk/src/preferences/screensaver/PreviewView.cpp =================================================================== --- haiku/trunk/src/preferences/screensaver/PreviewView.cpp 2010-06-06 13:05:47 UTC (rev 37033) +++ haiku/trunk/src/preferences/screensaver/PreviewView.cpp 2010-06-06 14:02:42 UTC (rev 37034) @@ -26,17 +26,17 @@ static float sampleY[]= {0,.05,.90,.95,.966,.975,1.0}; -inline BPoint -scale2(int x, int y,BRect area) -{ - return scale_direct(sampleX[x],sampleY[y],area); +inline BPoint +scale2(int x, int y,BRect area) +{ + return scale_direct(sampleX[x],sampleY[y],area); } -inline BRect -scale2(int x1, int x2, int y1, int y2,BRect area) -{ - return scale_direct(sampleX[x1],sampleX[x2],sampleY[y1],sampleY[y2],area); +inline BRect +scale2(int x1, int x2, int y1, int y2,BRect area) +{ + return scale_direct(sampleX[x1],sampleX[x2],sampleY[y1],sampleY[y2],area); } @@ -50,7 +50,7 @@ PreviewView::~PreviewView() { -} +} BView* @@ -72,7 +72,9 @@ if (fSaverView != NULL) RemoveChild(fSaverView); - return fSaverView; + BView* saverView = fSaverView; + fSaverView = NULL; + return saverView; } @@ -99,4 +101,3 @@ SetHighColor(96,96,96); FillRect(scale2(5,6,4,5,Bounds())); } -