wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 906030 - Don't create profiles when checking if they're locked. r=bnicholson

Browse Source
This commit is contained in:
Wes Johnston 2013-09-11 10:10:47 -07:00
parent dd169df84a
commit 1d64f9bf07
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mobile/android/base/GeckoProfile.java
View File

@ -68,7 +68,7 @@ public final class GeckoProfile {
}
GeckoProfile guest = GeckoProfile.getGuestProfile(context);
// if the guest profile exists and is locked, return it
// if the guest profile is locked, return it
if (guest != null && guest.locked()) {
return guest;
}
@ -231,14 +231,21 @@ public final class GeckoProfile {
return mLocked == LockState.LOCKED;
}
File lockFile = new File(getDir(), LOCK_FILE_NAME);
boolean res = lockFile.exists();
mLocked = res ? LockState.LOCKED : LockState.UNLOCKED;
return res;
// Don't use getDir() as it will create a dir if none exists
if (mDir != null && mDir.exists()) {
File lockFile = new File(mDir, LOCK_FILE_NAME);
boolean res = lockFile.exists();
mLocked = res ? LockState.LOCKED : LockState.UNLOCKED;
} else {
mLocked = LockState.UNLOCKED;
}
return mLocked == LockState.LOCKED;
}
public boolean lock() {
try {
// If this dir doesn't exist getDir will create it for us
File lockFile = new File(getDir(), LOCK_FILE_NAME);
boolean result = lockFile.createNewFile();
if (result) {
@ -255,8 +262,13 @@ public final class GeckoProfile {
}
public boolean unlock() {
// Don't use getDir() as it will create a dir
if (mDir == null || !mDir.exists()) {
return true;
}
try {
File lockFile = new File(getDir(), LOCK_FILE_NAME);
File lockFile = new File(mDir, LOCK_FILE_NAME);
boolean result = delete(lockFile);
if (result) {
mLocked = LockState.UNLOCKED;