Skip to content

Commit

Permalink
Fix settings merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
kieranc committed Oct 18, 2021
1 parent ff1fce1 commit 1c3372b
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/displayapp/screens/settings/Settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ Settings::Settings(Pinetime::Applications::DisplayApp* app, Pinetime::Controller
},
[this]() -> std::unique_ptr<Screen> {
return CreateScreen2();
},
[this]() -> std::unique_ptr<Screen> {
return CreateScreen3();
}},
Screens::ScreenListModes::UpDown} {
}
Expand All @@ -39,7 +42,7 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
{Symbols::home, "Watch face", Apps::SettingWatchFace},
}};

return std::make_unique<Screens::List>(0, 2, app, settingsController, applications);
return std::make_unique<Screens::List>(0, 3, app, settingsController, applications);
}

std::unique_ptr<Screen> Settings::CreateScreen2() {
Expand All @@ -63,5 +66,5 @@ std::unique_ptr<Screen> Settings::CreateScreen3() {
{Symbols::none, "None", Apps::None}
}};

return std::make_unique<Screens::List>(1, 2, app, settingsController, applications);
return std::make_unique<Screens::List>(2, 3, app, settingsController, applications);
}

0 comments on commit 1c3372b

Please sign in to comment.