piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

DolphinWX: Clean up some wxTimer code

Browse Source 
Technically fixes a memory leak (which wouldn't matter because the timer is only created once and destroyed on shutdown).

Also starting and stopping the timer does not cause leaks.
This commit is contained in:
Lioncash
2015-02-28 20:25:50 -05:00
parent 4fd980e6d4
commit 4cc19ac926
4 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinWX/LogWindow.h
View File

@ -14,6 +14,7 @@
#include <wx/gdicmn.h>
#include <wx/panel.h>
#include <wx/string.h>
#include <wx/timer.h>
#include <wx/translation.h>
#include <wx/windowid.h>
@ -25,8 +26,6 @@ class wxBoxSizer;
class wxCheckBox;
class wxChoice;
class wxTextCtrl;
class wxTimer;
class wxTimerEvent;
// Uses multiple inheritance - only sane because LogListener is a pure virtual interface.
class CLogWindow : public wxPanel, LogListener
@ -50,8 +49,7 @@ private:
CFrame* Parent;
wxFont DefaultFont, MonoSpaceFont;
std::vector<wxFont> LogFont;
wxTimer* m_LogTimer;
bool m_ignoreLogTimer;
wxTimer m_LogTimer;
LogManager* m_LogManager;
std::queue<std::pair<u8, wxString> > msgQueue;
bool m_writeFile, m_writeWindow, m_writeDebugger, m_LogAccess;