Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions VortexEngine/src/Menus/MainMenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ bool MainMenu::init()
// main menus start open
m_isOpen = true;
m_curSelection = 0;
// set default profile colors to begin
setDefaultProfileColors();
return true;
}

Expand Down
12 changes: 8 additions & 4 deletions VortexEngine/src/Modes/Modes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,14 @@ bool Modes::saveStorage()

bool Modes::loadStorage()
{
// NOTE: The save header is global and was already loaded in init(), the
// mode header at slot 0 of this page holds the number of modes
// stored in this profile
// NOTE: The save header lives in the global storage space and none of the
// modes below need anything from it, but loading the save header is
// part of loading storage so the device-wide settings are refreshed
if (!loadHeader()) {
return false;
}
// the mode header at slot 0 of this page holds the number of modes
// stored in this profile
ByteStream modeHeader;
if (!Storage::readModeHeader(modeHeader) || !modeHeader.size()) {
DEBUG_LOG("Empty buffer read from storage");
Expand Down Expand Up @@ -422,7 +427,6 @@ bool Modes::setDefaults()
Colorset set(def.numColors, def.cols);
addMode(def.patternID, nullptr, &set);
}
MainMenu::setDefaultProfileColors();
return true;
}

Expand Down
8 changes: 4 additions & 4 deletions VortexEngine/src/VortexEngine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ bool VortexEngine::init()
DEBUG_LOG("Menus failed to initialize");
return false;
}
if (!Modes::init()) {
DEBUG_LOG("Settings failed to initialize");
return false;
}
if (!MainMenu::init()) {
DEBUG_LOG("Main menu failed to initialize");
return false;
}
if (!Modes::init()) {
DEBUG_LOG("Settings failed to initialize");
return false;
}
if (!UPDI::init()) {
DEBUG_LOG("UPDI failed to initialize");
return false;
Expand Down
Loading