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:
parent
cdae90d9a1
commit
ba39e0f2b3
|
@ -268,6 +268,14 @@ void toolsLogging()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void toolsLoggingClose()
|
||||||
|
{
|
||||||
|
if(Logging::instance != NULL) {
|
||||||
|
Logging::instance->DestroyWindow();
|
||||||
|
Logging::instance = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void toolsLog(const char *s)
|
void toolsLog(const char *s)
|
||||||
{
|
{
|
||||||
CString str;
|
CString str;
|
||||||
|
|
|
@ -97,6 +97,7 @@ class Logging : public ResizeDlg
|
||||||
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
|
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
|
||||||
|
|
||||||
void toolsLogging();
|
void toolsLogging();
|
||||||
|
void toolsLoggingClose();
|
||||||
void toolsLog(const char *s);
|
void toolsLog(const char *s);
|
||||||
void toolsClearLog();
|
void toolsClearLog();
|
||||||
|
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
#include "RomInfo.h"
|
#include "RomInfo.h"
|
||||||
#include "Reg.h"
|
#include "Reg.h"
|
||||||
#include "WinResUtil.h"
|
#include "WinResUtil.h"
|
||||||
|
#include "Logging.h"
|
||||||
|
|
||||||
#include "../GBA.h"
|
#include "../GBA.h"
|
||||||
#include "../Globals.h"
|
#include "../Globals.h"
|
||||||
|
@ -689,10 +690,12 @@ void MainWnd::OnUpdateFileRominformation(CCmdUI* pCmdUI)
|
||||||
pCmdUI->Enable(emulating);
|
pCmdUI->Enable(emulating);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//OnFileToggleFullscreen
|
||||||
void MainWnd::OnFileTogglemenu()
|
void MainWnd::OnFileTogglemenu()
|
||||||
{
|
{
|
||||||
if( theApp.videoOption <= VIDEO_4X ) {
|
if( theApp.videoOption <= VIDEO_4X ) {
|
||||||
// switch to full screen
|
// switch to full screen
|
||||||
|
toolsLoggingClose(); // close log dialog
|
||||||
theApp.updateWindowSize( theApp.lastFullscreen );
|
theApp.updateWindowSize( theApp.lastFullscreen );
|
||||||
} else {
|
} else {
|
||||||
// switch to windowed mode
|
// switch to windowed mode
|
||||||
|
|
Loading…
Reference in New Issue