mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-06 22:46:06 +02:00
Touch ups
This commit is contained in:
+6
-7
@@ -110,22 +110,21 @@ namespace VRCX
|
|||||||
{
|
{
|
||||||
logger.Error(e, "Handled Exception, Missing file found in Handle Cef Explosion.");
|
logger.Error(e, "Handled Exception, Missing file found in Handle Cef Explosion.");
|
||||||
|
|
||||||
var result = MessageBox.Show("VRCX Has encountered an error with the CefSharp backend, \nthis is typically caused by missing files or dependencies\nWould you like to try an autofix and automatically install vc_redist?.", "VRCX CefSharp not found.", MessageBoxButtons.YesNo, MessageBoxIcon.Error);
|
var result = MessageBox.Show("VRCX has encountered an error with the CefSharp backend,\nthis is typically caused by missing files or dependencies.\nWould you like to try autofix by automatically installing vc_redist?.", "VRCX CefSharp not found.", MessageBoxButtons.YesNo, MessageBoxIcon.Error);
|
||||||
|
|
||||||
switch (result)
|
switch (result)
|
||||||
{
|
{
|
||||||
case DialogResult.Yes:
|
case DialogResult.Yes:
|
||||||
logger.Fatal("Handled Exception, User selected auto install of vc_redist.");
|
logger.Fatal("Handled Exception, user selected auto install of vc_redist.");
|
||||||
Update.DownloadInstallRedist();
|
Update.DownloadInstallRedist();
|
||||||
MessageBox.Show(
|
MessageBox.Show(
|
||||||
"vc_redist has finished installing, if the issue continues upon next restart, please reinstall reinstall VRCX From GitHub,\nVRCX Will now restart.", "vc_redist installation complete", MessageBoxButtons.OK);
|
"vc_redist has finished installing, if the issue persists upon next restart, please reinstall VRCX From GitHub,\nVRCX Will now restart.", "vc_redist installation complete", MessageBoxButtons.OK);
|
||||||
Thread.Sleep(5000);
|
Thread.Sleep(5000);
|
||||||
AppApi.Instance.RestartApplication();
|
AppApi.Instance.RestartApplication();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case DialogResult.No:
|
case DialogResult.No:
|
||||||
logger.Fatal("Handled Exception, User choose manual.");
|
logger.Fatal("Handled Exception, user chose manual.");
|
||||||
MessageBox.Show("VRCX will now close, try reinstalling VRCX from Github setup exe as a possible fix.", "VRCX CefSharp not found", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
MessageBox.Show("VRCX will now close, try reinstalling VRCX using the setup from Github as a potential fix.", "VRCX CefSharp not found", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
Thread.Sleep(5000);
|
Thread.Sleep(5000);
|
||||||
Environment.Exit(0);
|
Environment.Exit(0);
|
||||||
break;
|
break;
|
||||||
@@ -135,7 +134,7 @@ namespace VRCX
|
|||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
logger.Fatal(e, "Unhandled Exception, program dying");
|
logger.Fatal(e, "Unhandled Exception, program dying");
|
||||||
MessageBox.Show(e.ToString(), "PLEASE REPORT IN https://vrcx.pypy.moe/discord", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
MessageBox.Show(e.ToString(), "PLEASE REPORT IN https://vrcx.app/discord", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
Environment.Exit(0);
|
Environment.Exit(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -140,15 +140,11 @@ Section "Install" SecInstall
|
|||||||
|
|
||||||
noupgrade:
|
noupgrade:
|
||||||
|
|
||||||
afterupgrade:
|
|
||||||
|
|
||||||
ReadRegStr $R0 HKLM "SOFTWARE\Classes\Installer\Dependencies\Microsoft.VS.VC_RuntimeMinimumVSU_amd64,v14" "Version"
|
|
||||||
IfErrors 0 VSRedistInstalled
|
|
||||||
|
|
||||||
inetc::get "https://aka.ms/vs/17/release/vc_redist.x64.exe" $TEMP\vcredist_x64.exe
|
inetc::get "https://aka.ms/vs/17/release/vc_redist.x64.exe" $TEMP\vcredist_x64.exe
|
||||||
ExecWait "$TEMP\vcredist_x64.exe /install /quiet /norestart"
|
ExecWait "$TEMP\vcredist_x64.exe /install /quiet /norestart"
|
||||||
Delete "$TEMP\vcredist_x64.exe"
|
Delete "$TEMP\vcredist_x64.exe"
|
||||||
VSRedistInstalled:
|
|
||||||
|
afterupgrade:
|
||||||
|
|
||||||
SetOutPath "$INSTDIR"
|
SetOutPath "$INSTDIR"
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
MIT License
|
MIT License
|
||||||
|
|
||||||
Copyright (c) 2019 pypy
|
Copyright (c) 2019 pypy & Natsumi
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|||||||
+27
-23
@@ -14901,31 +14901,29 @@ speechSynthesis.getVoices();
|
|||||||
)
|
)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!this.checkCanInvite(currentLocation))
|
if (!this.checkCanInvite(currentLocation)) return;
|
||||||
return;
|
|
||||||
|
|
||||||
var L = this.parseLocation(currentLocation);
|
var L = this.parseLocation(currentLocation);
|
||||||
|
this.getCachedWorld({
|
||||||
try {
|
worldId: L.worldId
|
||||||
this.getCachedWorld({
|
}).then((args1) => {
|
||||||
worldId: L.worldId
|
this.sendInvite(
|
||||||
}).then((args1) => {
|
{
|
||||||
this.sendInvite(
|
instanceId: L.tag,
|
||||||
{
|
worldId: L.tag,
|
||||||
instanceId: L.tag,
|
worldName: args1.ref.name,
|
||||||
worldId: L.tag,
|
rsvp: true
|
||||||
worldName: args1.ref.name,
|
},
|
||||||
rsvp: true
|
ref.senderUserId
|
||||||
},
|
)
|
||||||
ref.senderUserId
|
.then((_args) => {
|
||||||
).then((_args) => {
|
|
||||||
$app.$message(`Auto invite sent to ${ref.senderUsername}`);
|
$app.$message(`Auto invite sent to ${ref.senderUsername}`);
|
||||||
return _args;
|
return _args;
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.error(err);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
} catch (err) {
|
|
||||||
console.error(err);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
$app.data.unseenNotifications = [];
|
$app.data.unseenNotifications = [];
|
||||||
@@ -22432,12 +22430,18 @@ speechSynthesis.getVoices();
|
|||||||
|
|
||||||
$app.watch.friendsListBulkUnfriendMode = (newV) => {
|
$app.watch.friendsListBulkUnfriendMode = (newV) => {
|
||||||
if (!newV) {
|
if (!newV) {
|
||||||
$app.friendsListTable.data.forEach(i => delete i.$selected);
|
$app.friendsListTable.data.forEach((i) => delete i.$selected);
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
$app.methods.showBulkUnfriendSelectionConfirm = function () {
|
$app.methods.showBulkUnfriendSelectionConfirm = function () {
|
||||||
var pendingUnfriendList = this.friendsListTable.data.reduce(
|
var pendingUnfriendList = this.friendsListTable.data.reduce(
|
||||||
(acc, ctx, i) => (ctx.$selected && acc.push(ctx.displayName), acc),
|
(acc, ctx) => {
|
||||||
|
if (ctx.$selected) {
|
||||||
|
acc.push(ctx.displayName);
|
||||||
|
}
|
||||||
|
return acc;
|
||||||
|
},
|
||||||
[]
|
[]
|
||||||
);
|
);
|
||||||
var elementsTicked = pendingUnfriendList.length;
|
var elementsTicked = pendingUnfriendList.length;
|
||||||
|
|||||||
Reference in New Issue
Block a user