MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-04 22:06:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(dbmerger): merge reserved table, Exception due null time in avatar_history (#1226)

Browse Source 
* Fixes merge reserved table, Exception due null time in avatar_history

* Revert of auto fixes not expected

* Add  null check in oldAvatarTime
This commit is contained in:
Tomachi
2025-05-06 23:40:29 +09:00
committed by GitHub
parent 7420bb65c6
commit 668b64665e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DBMerger/Merger.cs
+8 -2
View File
@@ -67,6 +67,12 @@ namespace DBMerger
continue; continue;
} }
unMergedTables.RemoveAt(i); unMergedTables.RemoveAt(i);
if (table.StartsWith("sqlite_"))
{
// Skip sqlite reserved tables
logger.Debug($"Skipping sqlite reserved table: {table}");
continue;
}
i--; i--;
// Then just tack them on // Then just tack them on
@@ -300,8 +306,8 @@ namespace DBMerger
return oldDateTime > newDateTime ? old : existing; return oldDateTime > newDateTime ? old : existing;
} }
var oldAvatarTime = old.Length >= 3 ? (int)old[2] : 0; var oldAvatarTime = old.Length >= 3 && old[2] != null ? (int)old[2] : 0;
var newAvatarTime = (int)existing[2]; var newAvatarTime = existing[2] != null ? (int)existing[2] : 0;
if (oldDateTime <= newDateTime) if (oldDateTime <= newDateTime)
{ {