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

Load default.xex as a regular module and call TerminateTitle when the main thread exits.

Browse Source
This commit is contained in:
Dr. Chat
2015-07-05 15:44:02 -05:00
parent 57e89e72b1
commit d6686fc345
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/xenia/kernel/xboxkrnl_module.cc
View File

@@ -177,14 +177,7 @@ XboxkrnlModule::~XboxkrnlModule() {
int XboxkrnlModule::LaunchModule(const char* path) { int XboxkrnlModule::LaunchModule(const char* path) {
// Create and register the module. We keep it local to this function and // Create and register the module. We keep it local to this function and
// dispose it on exit. // dispose it on exit.
auto module = object_ref<XUserModule>(new XUserModule(kernel_state_, path)); auto module = kernel_state_->LoadUserModule(path);
// Load the module into memory from the filesystem.
X_STATUS result_code = module->LoadFromFile(path);
if (XFAILED(result_code)) {
XELOGE("Failed to load module %s: %.8X", path, result_code);
return 1;
}
// Set as the main module, while running. // Set as the main module, while running.
kernel_state_->SetExecutableModule(module); kernel_state_->SetExecutableModule(module);
@@ -196,7 +189,10 @@ int XboxkrnlModule::LaunchModule(const char* path) {
// Launch the module. // Launch the module.
// NOTE: this won't return until the module exits. // NOTE: this won't return until the module exits.
result_code = module->Launch(0); X_STATUS result_code = module->Launch(0);
// Main thread exited. Terminate the title.
kernel_state_->TerminateTitle();
kernel_state_->SetExecutableModule(NULL); kernel_state_->SetExecutableModule(NULL);
if (XFAILED(result_code)) { if (XFAILED(result_code)) {
XELOGE("Failed to launch module %s: %.8X", path, result_code); XELOGE("Failed to launch module %s: %.8X", path, result_code);