Skip to content

Commit cada0c3

Browse files
committed
Fix build. Reorder settings.
1 parent e9cd76b commit cada0c3

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/SnapshotManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ VideoSnapshot SnapshotManager::snapshot_latest_blocking(){
198198
}
199199

200200
VideoSnapshot SnapshotManager::snapshot_recent_nonblocking(WallClock min_time){
201-
WallClock now = current_time();
201+
// WallClock now = current_time();
202202

203203
std::lock_guard<std::mutex> lg(m_lock);
204204

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,12 @@ ConsoleSettings::ConsoleSettings()
129129
PA_ADD_OPTION(START_GAME_INTERNET_CHECK_DELAY0);
130130
PA_ADD_OPTION(TOLERATE_SYSTEM_UPDATE_MENU_FAST);
131131
PA_ADD_OPTION(TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
132-
PA_ADD_OPTION(TIMING_OPTIONS);
133132
if (PreloadSettings::instance().DEVELOPER_MODE){
134133
PA_ADD_OPTION(ENABLE_SBB3_PINGS);
135134
PA_ADD_OPTION(ENABLE_SBB3_LOGGING);
135+
}
136+
PA_ADD_OPTION(TIMING_OPTIONS);
137+
if (PreloadSettings::instance().DEVELOPER_MODE){
136138
PA_ADD_OPTION(SWITCH1_DIGIT_ENTRY);
137139
PA_ADD_OPTION(SWITCH1_KEYBOARD_ENTRY);
138140
PA_ADD_OPTION(SWITCH2_DIGIT_ENTRY);

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ class ConsoleSettings : public BatchOption{
4949
BooleanCheckBoxOption TOLERATE_SYSTEM_UPDATE_MENU_FAST;
5050
BooleanCheckBoxOption TOLERATE_SYSTEM_UPDATE_MENU_SLOW;
5151

52-
TimingOptions TIMING_OPTIONS;
53-
5452
BooleanCheckBoxOption ENABLE_SBB3_PINGS;
5553
BooleanCheckBoxOption ENABLE_SBB3_LOGGING;
5654

55+
TimingOptions TIMING_OPTIONS;
56+
5757
DigitEntryTimingsOption SWITCH1_DIGIT_ENTRY;
5858
KeyboardEntryTimingsOption SWITCH1_KEYBOARD_ENTRY;
5959
DigitEntryTimingsOption SWITCH2_DIGIT_ENTRY;

0 commit comments

Comments
 (0)