Merge remote-tracking branch 'upstream/canary_experimental' into edge

This commit is contained in:
Herman S.
2025-12-05 08:27:15 +09:00
2 changed files with 5 additions and 3 deletions
+3 -2
View File
@@ -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);
+2 -1
View File
@@ -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);
}
}