From a15a5ad5c3220251ce3c325598fa1ee3f30a0b1c Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Wed, 28 Aug 2019 20:42:06 +0800
Subject: [PATCH] Fix Portrait mode Exit/Back key

---
 forge-gui-mobile/src/forge/Forge.java                       | 4 ++--
 .../src/main/java/forge/download/GuiDownloadService.java    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index f74fd303907..28a8b23dff0 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -175,7 +175,7 @@ public class Forge implements ApplicationListener {
     }
 
     public static void back() {
-        if(destroyThis)
+        if(destroyThis && isLandscapeMode())
             return;
         if (screens.size() < 2) {
             exit(false); //prompt to exit if attempting to go back from home screen
@@ -494,7 +494,7 @@ public class Forge implements ApplicationListener {
             if(keyCode == Keys.BACK){
                 if (destroyThis)
                     deviceAdapter.exit();
-                else if(onHomeScreen())
+                else if(onHomeScreen() && isLandscapeMode())
                     back();
             }
             if (keyInputAdapter == null) {
diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadService.java b/forge-gui/src/main/java/forge/download/GuiDownloadService.java
index 80b39ddde47..88f39d77b95 100644
--- a/forge-gui/src/main/java/forge/download/GuiDownloadService.java
+++ b/forge-gui/src/main/java/forge/download/GuiDownloadService.java
@@ -270,7 +270,7 @@ public abstract class GuiDownloadService implements Runnable {
             final String filePath = fileDest.getPath();
             final String subLastIndex = filePath.contains("pics") ? "\\pics\\" : "\\db\\";
 
-            System.out.println(count + "/" + totalCount + " - ..\\" + filePath.substring(filePath.lastIndexOf(subLastIndex)+1));
+            System.out.println(count + "/" + totalCount + " - .." + filePath.substring(filePath.lastIndexOf(subLastIndex)+1));
 
             FileOutputStream fos = null;
             try {
@@ -295,7 +295,7 @@ public abstract class GuiDownloadService implements Runnable {
                         conn.disconnect();
                         if(url.contains("/images/")){
                             isLogged = true;
-                            System.out.println("File not found: ../" + url.substring(url.lastIndexOf("/images/")+1));
+                            System.out.println("File not found: .." + url.substring(url.lastIndexOf("/images/")+1));
                         }
                         url = url.substring(0,url.length() - 4) + ".png";
                         imageUrl = new URL(url);
@@ -316,7 +316,7 @@ public abstract class GuiDownloadService implements Runnable {
                     case HttpURLConnection.HTTP_NOT_FOUND:
                         conn.disconnect();
                         if(url.contains("/images/") && !isJPG && !isLogged)
-                            System.out.println("File not found: ../" + url.substring(url.lastIndexOf("/images/")+1));
+                            System.out.println("File not found: .." + url.substring(url.lastIndexOf("/images/")+1));
                         break;
                     default:
                         conn.disconnect();