i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* sets fSaverView in RemovePreview() to NULL, thus avoiding a crash in ModulesView::_CloseSaver().

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37034 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2010-06-06 14:02:42 +00:00
parent e845f05e28
commit 7269cc8afd
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/screensaver/PreviewView.cpp
+12 -11
View File
@@ -26,17 +26,17 @@ static float sampleX[]= {0,.05,.15,.7,.725,.8,.825,.85,.950,1.0};
static float sampleY[]= {0,.05,.90,.95,.966,.975,1.0}; static float sampleY[]= {0,.05,.90,.95,.966,.975,1.0};
inline BPoint inline BPoint
scale2(int x, int y,BRect area) scale2(int x, int y,BRect area)
{ {
return scale_direct(sampleX[x],sampleY[y],area); return scale_direct(sampleX[x],sampleY[y],area);
} }
inline BRect inline BRect
scale2(int x1, int x2, int y1, int y2,BRect area) scale2(int x1, int x2, int y1, int y2,BRect area)
{ {
return scale_direct(sampleX[x1],sampleX[x2],sampleY[y1],sampleY[y2],area); return scale_direct(sampleX[x1],sampleX[x2],sampleY[y1],sampleY[y2],area);
} }
@@ -50,7 +50,7 @@ PreviewView::PreviewView(BRect frame, const char *name)
PreviewView::~PreviewView() PreviewView::~PreviewView()
{ {
} }
BView* BView*
@@ -72,7 +72,9 @@ PreviewView::RemovePreview()
if (fSaverView != NULL) if (fSaverView != NULL)
RemoveChild(fSaverView); RemoveChild(fSaverView);
return fSaverView; BView* saverView = fSaverView;
fSaverView = NULL;
return saverView;
} }
@@ -99,4 +101,3 @@ PreviewView::Draw(BRect update)
SetHighColor(96,96,96); SetHighColor(96,96,96);
FillRect(scale2(5,6,4,5,Bounds())); FillRect(scale2(5,6,4,5,Bounds()));
} }