Fix some silly mistakes

Author: Hydr8gon

src/android/java/com/hydra/noods/FileBrowser.java

@@ -416,7 +416,7 @@ private void update()
             if (ext.equals(".nds"))
             {
                 Uri uri = file.getUri();
-                setNdsRom(uri.getPath(), getRomFd(uri), getSaveFd(file), getStateFd(file), getCheatFd(file));
+                setNdsRom(uri.getPath(), getRomFd(uri, false), getSaveFd(file), getStateFd(file), getCheatFd(file));
 
                 if (isGbaLoaded())
                 {
@@ -460,7 +460,7 @@ public void onCancel(DialogInterface dialog)
             else
             {
                 Uri uri = file.getUri();
-                setGbaRom(uri.getPath(), getRomFd(uri), getSaveFd(file), getStateFd(file));
+                setGbaRom(uri.getPath(), getRomFd(uri, false), getSaveFd(file), getStateFd(file));
 
                 if (isNdsLoaded())
                 {
@@ -569,7 +569,7 @@ private void processFile(FileAdapter.FileInfo info, boolean directory)
         if (ext.equals(".nds"))
         {
             Bitmap bitmap = Bitmap.createBitmap(32, 32, Bitmap.Config.ARGB_8888);
-            getNdsIcon(getRomFd(info.uri), bitmap);
+            getNdsIcon(getRomFd(info.uri, true), bitmap);
             info.icon = bitmap;
             fileInfo.add(info);
         }
@@ -580,12 +580,12 @@ else if (ext.equals(".gba"))
         }
     }
 
-    private int getRomFd(Uri romUri)
+    private int getRomFd(Uri romUri, boolean override)
     {
         try
         {
             // Get a descriptor for the file in scoped mode
-            if (!scoped) return -1;
+            if (!scoped && !override) return -1;
             return getContentResolver().openFileDescriptor(romUri, "r").detachFd();
         }
         catch (Exception e)

src/settings.cpp

@@ -37,7 +37,7 @@ std::string Settings::bios7Path = "bios7.bin";
 std::string Settings::firmwarePath = "firmware.bin";
 std::string Settings::gbaBiosPath = "gba_bios.bin";
 std::string Settings::sdImagePath = "sd.img";
-std::string Settings::basePath = "";
+std::string Settings::basePath = ".";
 
 std::vector<Setting> Settings::settings =
 {

src/settings.h

@@ -55,7 +55,7 @@ class Settings
         static std::string basePath;
 
         static void add(std::vector<Setting> &settings);
-        static bool load(std::string path = "");
+        static bool load(std::string path = ".");
         static bool save();
 
     private: