[UI] Shuffle some exit handling code around

This commit is contained in:
DrChat
2017-12-17 12:37:58 -06:00
parent 39b5d8ba42
commit 8ec8d9778f
3 changed files with 3 additions and 8 deletions

View File

@@ -75,10 +75,6 @@ bool EmulatorWindow::Initialize() {
window_->on_closed.AddListener([this](UIEvent* e) {
loop_->Quit();
// TODO(benvanik): proper exit.
XELOGI("User-initiated death!");
exit(1);
});
loop_->on_quit.AddListener([this](UIEvent* e) { window_.reset(); });

View File

@@ -178,6 +178,9 @@ int xenia_main(const std::vector<std::wstring>& args) {
emulator_window->loop()->on_quit.AddListener([&](ui::UIEvent* e) {
exiting = true;
evt->Set();
XELOGI("Cheap-skate exit!");
exit(0);
});
// Enable the main menu now that the emulator is properly loaded