fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring window stuff. Still needs some work.

Browse Source
This commit is contained in:
Ben Vanik
2014-01-14 22:40:02 -08:00
parent e7d61f4b1f
commit 991e7d8ad3
23 changed files with 926 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenia/emulator.cc
View File

@@ -19,6 +19,7 @@
#include <xenia/kernel/kernel_state.h>
#include <xenia/kernel/modules.h>
#include <xenia/kernel/fs/filesystem.h>
#include <xenia/ui/window.h>
using namespace xe;
@@ -29,9 +30,11 @@ using namespace xe::gpu;
using namespace xe::hid;
using namespace xe::kernel;
using namespace xe::kernel::fs;
using namespace xe::ui;
Emulator::Emulator(const xechar_t* command_line) :
main_window_(0),
memory_(0),
debug_server_(0),
processor_(0),
@@ -44,6 +47,10 @@ Emulator::Emulator(const xechar_t* command_line) :
Emulator::~Emulator() {
// Note that we delete things in the reverse order they were initialized.
if (main_window_) {
main_window_->Close();
}
// Disconnect all debug clients first.
if (debug_server_) {
debug_server_->Shutdown();