mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 11:18:01 +00:00
Fix so duels screen opened if setting quest after Load or New quest screen was opened directly from the home screen
This commit is contained in:
@@ -128,6 +128,10 @@ public class Forge implements ApplicationListener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static boolean onHomeScreen() {
|
||||||
|
return screens.size() == 1;
|
||||||
|
}
|
||||||
|
|
||||||
public static void back() {
|
public static void back() {
|
||||||
if (screens.size() < 2) {
|
if (screens.size() < 2) {
|
||||||
exit(); //prompt to exit if attempting to go back from home screen
|
exit(); //prompt to exit if attempting to go back from home screen
|
||||||
|
|||||||
@@ -158,12 +158,18 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats {
|
|||||||
decksScreen.refreshDecks();
|
decksScreen.refreshDecks();
|
||||||
if (reason == LaunchReason.LoadQuest) {
|
if (reason == LaunchReason.LoadQuest) {
|
||||||
Forge.back();
|
Forge.back();
|
||||||
|
if (Forge.onHomeScreen()) { //open duels screen if Load Quest screen was opening direct from home screen
|
||||||
|
Forge.openScreen(duelsScreen);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Forge.back();
|
Forge.back();
|
||||||
if (Forge.getCurrentScreen() instanceof LoadQuestScreen) {
|
if (Forge.getCurrentScreen() instanceof LoadQuestScreen) {
|
||||||
Forge.back(); //remove LoadQuestScreen from screen stack
|
Forge.back(); //remove LoadQuestScreen from screen stack
|
||||||
}
|
}
|
||||||
|
if (Forge.onHomeScreen()) { //open duels screen if New Quest screen was opening direct from home screen
|
||||||
|
Forge.openScreen(duelsScreen);
|
||||||
|
}
|
||||||
if (Forge.getCurrentScreen() != decksScreen) {
|
if (Forge.getCurrentScreen() != decksScreen) {
|
||||||
Forge.openScreen(decksScreen); //open deck screen for new quest
|
Forge.openScreen(decksScreen); //open deck screen for new quest
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user