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

Finishing unique_ptr'ing and fixing file memory management (for now).

Browse Source
This commit is contained in:
Ben Vanik
2014-08-21 07:54:19 -07:00
parent c59d053404
commit 08b0226a16
26 changed files with 152 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/emulator.cc
View File

@@ -33,7 +33,7 @@ using namespace xe::kernel::fs;
using namespace xe::ui;
Emulator::Emulator(const std::wstring& command_line)
: command_line_(command_line) {}
: command_line_(command_line), main_window_(nullptr) {}
Emulator::~Emulator() {
// Note that we delete things in the reverse order they were initialized.
@@ -134,8 +134,8 @@ X_STATUS Emulator::Setup() {
kernel_state_ = std::make_unique<KernelState>(this);
// HLE kernel modules.
xboxkrnl_ = std::make_unique<XboxkrnlModule>(this, kernel_state_);
xam_ = std::make_unique<XamModule>(this, kernel_state_);
xboxkrnl_ = std::make_unique<XboxkrnlModule>(this, kernel_state_.get());
xam_ = std::make_unique<XamModule>(this, kernel_state_.get());
return result;
}