Добавлена проверка на двойное монтирование образов флоппи-дисков

3cky · Oct 29, 2020 · dcba6cd · dcba6cd
1 parent b8887f5
commit dcba6cd
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/app/src/main/java/su/comp/bk/ui/BkEmuActivity.java b/app/src/main/java/su/comp/bk/ui/BkEmuActivity.java
@@ -1061,7 +1061,12 @@ private boolean doMountFddImage(FloppyController fddController,
                                     FloppyDriveIdentifier fddIdentifier,
                                     File fddImageFile, boolean isWriteProtectMode) {
         try {
-            if (fddController != null) {
+            if (fddImageFile != null && fddController != null) {
+                for (FloppyDriveIdentifier d : FloppyDriveIdentifier.values()) {
+                    if (fddImageFile.equals(fddController.getFloppyDriveImageFile(d))) {
+                        unmountFddImage(d);
+                    }
+                }
                 fddController.mountDiskImage(fddImageFile, fddIdentifier, isWriteProtectMode);
                 Timber.d("Mounted floppy disk image %s to drive %s in %s mode",
                         fddImageFile, fddIdentifier, (isWriteProtectMode ? "write protect" : "normal"));