mirror of
https://github.com/jamessanford/kegs.git
synced 2024-09-27 08:54:33 +00:00
Use new drive number when attaching hard drive images.
This commit is contained in:
parent
cfad789cf8
commit
d12e3a8d0c
@ -53,11 +53,11 @@ public class KegsMain extends SherlockFragmentActivity implements KegsKeyboard.S
|
|||||||
private long mScreenSizeTime = 0;
|
private long mScreenSizeTime = 0;
|
||||||
|
|
||||||
private boolean mPaused = false;
|
private boolean mPaused = false;
|
||||||
final ArrayDeque<Runnable> mResumeQueue = new ArrayDeque<Runnable>();
|
private final ArrayDeque<Runnable> mResumeQueue = new ArrayDeque<Runnable>();
|
||||||
final Runnable mErrorFinish = new Runnable() { public void run() { finish(); } };
|
private final Runnable mErrorFinish = new Runnable() { public void run() { finish(); } };
|
||||||
|
|
||||||
private DiskLoader mDiskLoader = null;
|
private DiskLoader mDiskLoader = null;
|
||||||
private int mNextDriveNumber = 2;
|
private final DiskImage.DriveNumber mDriveNumber = new DiskImage.DriveNumber();
|
||||||
|
|
||||||
private void withUIActive(final Runnable runnable) {
|
private void withUIActive(final Runnable runnable) {
|
||||||
if(!mPaused) {
|
if(!mPaused) {
|
||||||
@ -153,12 +153,7 @@ public class KegsMain extends SherlockFragmentActivity implements KegsKeyboard.S
|
|||||||
getThread().allowPowerOn();
|
getThread().allowPowerOn();
|
||||||
} else if (image.action == DiskImage.SWAP) {
|
} else if (image.action == DiskImage.SWAP) {
|
||||||
if (image.isHardDrive()) {
|
if (image.isHardDrive()) {
|
||||||
// Probably not the right place for this.
|
image.chooseDriveNumber(mDriveNumber);
|
||||||
image.updateDriveNumber(mNextDriveNumber);
|
|
||||||
mNextDriveNumber += 1;
|
|
||||||
if (mNextDriveNumber > 7) {
|
|
||||||
mNextDriveNumber = 2;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
getThread().getEventQueue().add(image.getDiskImageEvent());
|
getThread().getEventQueue().add(image.getDiskImageEvent());
|
||||||
}
|
}
|
||||||
|
@ -116,8 +116,12 @@ class DiskImage implements Comparable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateDriveNumber(int drive) {
|
public void chooseDriveNumber(final DriveNumber driveNumber) {
|
||||||
this.drive = this.drive.substring(0, 3) + drive;
|
this.drive = this.drive.substring(0, 3) + driveNumber.drive;
|
||||||
|
driveNumber.drive++;
|
||||||
|
if (driveNumber.drive > 7) {
|
||||||
|
driveNumber.drive = 2;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isHardDrive() {
|
public boolean isHardDrive() {
|
||||||
@ -131,4 +135,8 @@ class DiskImage implements Comparable {
|
|||||||
throw new ClassCastException();
|
throw new ClassCastException();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static class DriveNumber {
|
||||||
|
public int drive = 2;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user