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

FIXED: Entering fullscreen while logging window was active caused dead-lock 

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@343 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
spacy51 2008-01-26 12:12:16 +00:00
parent cdae90d9a1
commit ba39e0f2b3
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/win32/Logging.cpp
View File

@ -268,6 +268,14 @@ void toolsLogging()
}
}
void toolsLoggingClose()
{
if(Logging::instance != NULL) {
Logging::instance->DestroyWindow();
Logging::instance = NULL;
}
}
void toolsLog(const char *s)
{
CString str;

1
src/win32/Logging.h
View File

@ -97,6 +97,7 @@ class Logging : public ResizeDlg
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
void toolsLogging();
void toolsLoggingClose();
void toolsLog(const char *s);
void toolsClearLog();

3
src/win32/MainWndFile.cpp
View File

@ -27,6 +27,7 @@
#include "RomInfo.h"
#include "Reg.h"
#include "WinResUtil.h"
#include "Logging.h"
#include "../GBA.h"
#include "../Globals.h"
@ -689,10 +690,12 @@ void MainWnd::OnUpdateFileRominformation(CCmdUI* pCmdUI)
pCmdUI->Enable(emulating);
}
//OnFileToggleFullscreen
void MainWnd::OnFileTogglemenu()
{
if( theApp.videoOption <= VIDEO_4X ) {
// switch to full screen
toolsLoggingClose(); // close log dialog
theApp.updateWindowSize( theApp.lastFullscreen );
} else {
// switch to windowed mode