From 0785aecac6361001ade02445589a64d39a1361ce Mon Sep 17 00:00:00 2001 From: Bitl Date: Wed, 20 May 2020 10:45:56 -0700 Subject: [PATCH] 1.2 Snapshot (7445.19279.1) --- NovetusLauncher/NovetusFuncs/LauncherFuncs.cs | 3 +-- NovetusLauncher/NovetusLauncher/CharacterCustomization.cs | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs b/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs index 7bb310b..6ddb9e7 100644 --- a/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs +++ b/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs @@ -918,8 +918,7 @@ public class LauncherFuncs string result = ""; if (GlobalVars.GraphicsMode == 1) { - result += "pcall(function() settings().Rendering.graphicsMode = 2 end);" - + " pcall(function() if settings().Rendering.graphicsMode ~= 2 then settings().Rendering.graphicsMode = 4 end end);"; + result += "xpcall( function() settings().Rendering.graphicsMode = 2 end, function( err ) settings().Rendering.graphicsMode = 4 end );"; } else if(GlobalVars.GraphicsMode == 2) { diff --git a/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs b/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs index cb403e4..34606bf 100644 --- a/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs +++ b/NovetusLauncher/NovetusLauncher/CharacterCustomization.cs @@ -1415,8 +1415,8 @@ namespace NovetusLauncher { LauncherFuncs.ReloadLoadtextValue(); string luafile = "rbxasset://scripts\\\\CSView.lua"; - string mapfile = GlobalVars.ConfigDirData + "\\preview\\content\\fonts\\3DView.rbxl"; - string rbxexe = GlobalVars.ConfigDirData + "\\preview\\3DView.exe"; + string mapfile = GlobalVars.BasePathLauncher + "\\preview\\content\\fonts\\3DView.rbxl"; + string rbxexe = GlobalVars.BasePathLauncher + "\\preview\\3DView.exe"; string quote = "\""; string args = quote + mapfile + "\" -script \"" + LauncherFuncs.ChangeGameSettings() + " dofile('" + luafile + "'); _G.CS3DView(0,'Player'," + GlobalVars.loadtext + ");" + quote; try