Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[glass] Fix order of loading window settings (#6056)

Browse Source
This commit is contained in:
truher
2023-12-23 13:12:09 -08:00
committed by GitHub
parent 22a322c9f3
commit ab309e34ef
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
glass/src/lib/native/cpp/Context.cpp
View File

@@ -178,8 +178,6 @@ static bool LoadStorageRootImpl(Context* ctx, const std::string& filename,
static bool LoadStorageImpl(Context* ctx, std::string_view dir,
std::string_view name) {
WorkspaceResetImpl();
bool rv = true;
for (auto&& root : ctx->storageRoots) {
std::string filename;
@@ -421,6 +419,7 @@ std::string glass::GetStorageDir() {
bool glass::LoadStorage(std::string_view dir) {
SaveStorage();
SetStorageDir(dir);
WorkspaceResetImpl();
LoadWindowStorageImpl((fs::path{gContext->storageLoadDir} /
fmt::format("{}-window.json", gContext->storageName))
.string());