ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Crap, a segfault bug crept in with the last commit. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1169 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2006-12-03 01:24:34 +00:00
parent f48ea59ca6
commit b4531c331a
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
stella/src/emucore/FrameBuffer.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: FrameBuffer.cxx,v 1.103 2006-12-03 01:13:45 stephena Exp $ // $Id: FrameBuffer.cxx,v 1.104 2006-12-03 01:24:34 stephena Exp $
//============================================================================ //============================================================================
#include <sstream> #include <sstream>
@ -71,10 +71,10 @@ void FrameBuffer::initialize(const string& title, uInt32 width, uInt32 height,
if(SDL_Init(initflags) < 0) if(SDL_Init(initflags) < 0)
return; return;
}
// Set window title and icon // Erase old contents
setWindowTitle(title); cls();
setWindowIcon();
// Query the desktop size // Query the desktop size
// This is really the job of SDL // This is really the job of SDL
@ -82,16 +82,12 @@ void FrameBuffer::initialize(const string& title, uInt32 width, uInt32 height,
myOSystem->getScreenDimensions(dwidth, dheight); myOSystem->getScreenDimensions(dwidth, dheight);
myDesktopDim.w = dwidth; myDesktopDim.h = dheight; myDesktopDim.w = dwidth; myDesktopDim.h = dheight;
// Set fullscreen flag
mySDLFlags = myOSystem->settings().getBool("fullscreen") ? SDL_FULLSCREEN : 0;
// Get the aspect ratio for the display if it's been enabled // Get the aspect ratio for the display if it's been enabled
theAspectRatio = 1.0; theAspectRatio = 1.0;
if(useAspect) setAspectRatio(); if(useAspect) setAspectRatio();
}
// Erase old contents // Set fullscreen flag
cls(); mySDLFlags = myOSystem->settings().getBool("fullscreen") ? SDL_FULLSCREEN : 0;
// Set the available scalers for this framebuffer, based on current eventhandler // Set the available scalers for this framebuffer, based on current eventhandler
// state and the maximum size of a window for the current desktop // state and the maximum size of a window for the current desktop
@ -103,6 +99,10 @@ void FrameBuffer::initialize(const string& title, uInt32 width, uInt32 height,
setScaler(scaler); setScaler(scaler);
initSubsystem(); initSubsystem();
// Set window title and icon
setWindowTitle(title);
setWindowIcon();
// And refresh the display // And refresh the display
myOSystem->eventHandler().refreshDisplay(); myOSystem->eventHandler().refreshDisplay();

3
stella/src/gui/LauncherDialog.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: LauncherDialog.cxx,v 1.58 2006-12-02 23:25:55 stephena Exp $ // $Id: LauncherDialog.cxx,v 1.59 2006-12-03 01:24:34 stephena Exp $
// //
// Based on code from ScummVM - Scumm Interpreter // Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project // Copyright (C) 2002-2004 The ScummVM project
@ -154,7 +154,6 @@ LauncherDialog::LauncherDialog(OSystem* osystem, DialogContainer* parent,
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
LauncherDialog::~LauncherDialog() LauncherDialog::~LauncherDialog()
{ {
cerr << "LauncherDialog::~LauncherDialog()\n";
delete myOptions; delete myOptions;
delete myGameList; delete myGameList;
} }