Compare commits
2 Commits
Canary-1.2
...
Canary-1.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e676fd8b17 | ||
|
|
dd16e3cee1 |
@@ -279,13 +279,13 @@ namespace Ryujinx.Ava.UI.Applet
|
|||||||
.ForEach(profile => profiles.Add(new Models.UserProfile(profile, nav)));
|
.ForEach(profile => profiles.Add(new Models.UserProfile(profile, nav)));
|
||||||
|
|
||||||
profiles.Add(new Models.UserProfile(guest, nav));
|
profiles.Add(new Models.UserProfile(guest, nav));
|
||||||
UserSelectorDialogViewModel viewModel = new();
|
UserSelectorDialogViewModel viewModel = new()
|
||||||
viewModel.Profiles = profiles;
|
{
|
||||||
viewModel.SelectedUserId = _parent.AccountManager.LastOpenedUser.UserId;
|
Profiles = profiles,
|
||||||
|
SelectedUserId = _parent.AccountManager.LastOpenedUser.UserId
|
||||||
|
};
|
||||||
UserSelectorDialog content = new(viewModel);
|
UserSelectorDialog content = new(viewModel);
|
||||||
(UserId id, _) = await UserSelectorDialog.ShowInputDialog(content);
|
(selected, _) = await UserSelectorDialog.ShowInputDialog(content);
|
||||||
|
|
||||||
selected = id;
|
|
||||||
|
|
||||||
dialogCloseEvent.Set();
|
dialogCloseEvent.Set();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -735,21 +735,19 @@ namespace Ryujinx.Ava.UI.Windows
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private static bool _intelMacWarningShown;
|
private static bool _intelMacWarningShown = !(OperatingSystem.IsMacOS() &&
|
||||||
|
(RuntimeInformation.OSArchitecture == Architecture.X64 ||
|
||||||
|
RuntimeInformation.OSArchitecture == Architecture.X86));
|
||||||
|
|
||||||
public static async Task ShowIntelMacWarningAsync()
|
public static async Task ShowIntelMacWarningAsync()
|
||||||
{
|
{
|
||||||
if (!_intelMacWarningShown &&
|
if (_intelMacWarningShown) return;
|
||||||
(OperatingSystem.IsMacOS() &&
|
|
||||||
(RuntimeInformation.OSArchitecture == Architecture.X64 ||
|
await Dispatcher.UIThread.InvokeAsync(async () => await ContentDialogHelper.CreateWarningDialog(
|
||||||
RuntimeInformation.OSArchitecture == Architecture.X86)))
|
"Intel Mac Warning",
|
||||||
{
|
"Intel Macs are not supported and will not work properly.\nIf you continue, do not come to our Discord asking for support;\nand do not report bugs on the GitHub. They will be closed."));
|
||||||
_intelMacWarningShown = true;
|
|
||||||
|
|
||||||
await Dispatcher.UIThread.InvokeAsync(async () => await ContentDialogHelper.CreateWarningDialog(
|
_intelMacWarningShown = true;
|
||||||
"Intel Mac Warning",
|
|
||||||
"Intel Macs are not supported and will not work properly.\nIf you continue, do not come to our Discord asking for support."));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user