mirror of
https://github.com/izzy2lost/xenia-edge.git
synced 2026-07-06 00:20:26 -07:00
Merge remote-tracking branch 'upstream/canary_experimental' into edge
This commit is contained in:
@@ -1483,8 +1483,9 @@ void EmulatorWindow::ExtractZarchive() {
|
||||
if (result != X_STATUS_SUCCESS) {
|
||||
std::error_code ec;
|
||||
|
||||
// delete incomplete output file
|
||||
std::filesystem::remove(abs_extract_dir, ec);
|
||||
if (!std::filesystem::is_empty(abs_extract_dir)) {
|
||||
std::filesystem::remove(abs_extract_dir, ec);
|
||||
}
|
||||
|
||||
summary += fmt::format("\nFailed: {}", zarchive_file_path);
|
||||
|
||||
|
||||
@@ -961,8 +961,9 @@ void KernelState::RegisterNotifyListener(XNotifyListener* listener) {
|
||||
}
|
||||
if (!has_notified_live_startup_ && listener->mask() & kXNotifyLive) {
|
||||
has_notified_live_startup_ = true;
|
||||
// X_ONLINE_S_LOGON_DISCONNECTED
|
||||
listener->EnqueueNotification(kXNotificationLiveConnectionChanged,
|
||||
0x80151802L);
|
||||
0x001510F1L);
|
||||
listener->EnqueueNotification(kXNotificationLiveLinkStateChanged, 0);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user