diff --git a/Dotnet/Cef/CefService.cs b/Dotnet/Cef/CefService.cs
index 69eabc90..2093503e 100644
--- a/Dotnet/Cef/CefService.cs
+++ b/Dotnet/Cef/CefService.cs
@@ -26,7 +26,7 @@ namespace VRCX
var userDataDir = Path.Join(Program.AppDataDirectory, "userdata");
// delete userdata if Cef version has been downgraded, fixes VRCX not opening after a downgrade
CheckCefVersion(userDataDir);
-
+
var cefSettings = new CefSettings
{
RootCachePath = userDataDir,
@@ -51,7 +51,7 @@ namespace VRCX
),
IsLocal = true
});
-
+
// cefSettings.CefCommandLineArgs.Add("ignore-certificate-errors");
// cefSettings.CefCommandLineArgs.Add("disable-plugins");
cefSettings.CefCommandLineArgs.Add("disable-spell-checking");
@@ -66,7 +66,7 @@ namespace VRCX
{
cefSettings.CefCommandLineArgs["proxy-server"] = WebApi.ProxyUrl;
}
-
+
if (VRCXStorage.Instance.Get("VRCX_DisableGpuAcceleration") == "true")
{
cefSettings.CefCommandLineArgs.Add("disable-gpu");
@@ -83,9 +83,9 @@ namespace VRCX
var extensionsPath = Path.Join(Program.AppDataDirectory, "extensions");
Directory.CreateDirectory(extensionsPath);
-
+
// extract Vue Devtools
- var vueDevtoolsCrxPath = Path.Join(Program.BaseDirectory, @"..\..\build-tools\Vue-js-devtools.crx");
+ var vueDevtoolsCrxPath = Path.Join(Program.BaseDirectory, @"..\..\Dotnet\build-tools\Vue-js-devtools.crx");
if (File.Exists(vueDevtoolsCrxPath))
{
var vueDevtoolsPath = Path.Join(extensionsPath, "Vue-js-devtools");
@@ -93,7 +93,7 @@ namespace VRCX
{
if (Directory.Exists(vueDevtoolsPath))
Directory.Delete(vueDevtoolsPath, true);
-
+
Directory.CreateDirectory(vueDevtoolsPath);
ZipFile.ExtractToDirectory(vueDevtoolsCrxPath, vueDevtoolsPath);
}
@@ -102,7 +102,7 @@ namespace VRCX
logger.Error(ex, "Failed to extract Vue Devtools");
}
}
-
+
// load extensions
var folders = Directory.GetDirectories(extensionsPath);
foreach (var folder in folders)
@@ -110,10 +110,10 @@ namespace VRCX
cefSettings.CefCommandLineArgs.Add("load-extension", folder);
}
}
-
+
CefSharpSettings.ShutdownOnExit = false;
CefSharpSettings.ConcurrentTaskExecution = true;
-
+
if (Cef.Initialize(cefSettings, false) == false)
{
logger.Error("Cef failed to initialize");
@@ -153,15 +153,18 @@ namespace VRCX
File.WriteAllBytes(_lastCefVersionPath, Encoding.UTF8.GetBytes(currentVersion));
logger.Info("Cef version: {0}", currentVersion);
}
-
+
private static void DeleteUserData(string userDataDir)
{
if (!Directory.Exists(userDataDir))
return;
-
- try {
+
+ try
+ {
Directory.Delete(userDataDir, true);
- } catch (Exception ex) {
+ }
+ catch (Exception ex)
+ {
logger.Error(ex, "Failed to delete userdata directory: {0}", userDataDir);
}
}
diff --git a/DBMerger/Config.cs b/Dotnet/DBMerger/Config.cs
similarity index 100%
rename from DBMerger/Config.cs
rename to Dotnet/DBMerger/Config.cs
diff --git a/DBMerger/DBMerger.csproj b/Dotnet/DBMerger/DBMerger.csproj
similarity index 100%
rename from DBMerger/DBMerger.csproj
rename to Dotnet/DBMerger/DBMerger.csproj
diff --git a/DBMerger/Merger.cs b/Dotnet/DBMerger/Merger.cs
similarity index 100%
rename from DBMerger/Merger.cs
rename to Dotnet/DBMerger/Merger.cs
diff --git a/DBMerger/Program.cs b/Dotnet/DBMerger/Program.cs
similarity index 100%
rename from DBMerger/Program.cs
rename to Dotnet/DBMerger/Program.cs
diff --git a/DBMerger/SqliteExtensions.cs b/Dotnet/DBMerger/SqliteExtensions.cs
similarity index 100%
rename from DBMerger/SqliteExtensions.cs
rename to Dotnet/DBMerger/SqliteExtensions.cs
diff --git a/Dotnet/VRCX-Cef.csproj b/Dotnet/VRCX-Cef.csproj
index 3e832521..60b0bf36 100644
--- a/Dotnet/VRCX-Cef.csproj
+++ b/Dotnet/VRCX-Cef.csproj
@@ -18,7 +18,7 @@
@@ -84,12 +83,10 @@ VRCX คือโปรแกรมคู่หูสำหรับ VRChat ท