Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-29 04:29:31 +00:00
Code Issues Projects Releases Wiki Activity

Bugfix disk path persistence : defer applying path to avoid re-entrancy into Apple2DisksMenu constructor

Browse Source
This commit is contained in:
Aaron Culliney 2015-08-22 12:10:52 -07:00
parent 36cb44e1e8
commit e4435a1e18
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java
View File

@ -60,11 +60,6 @@ public class Apple2DisksMenu implements Apple2MenuView {
public Apple2DisksMenu(Apple2Activity activity) { public Apple2DisksMenu(Apple2Activity activity) {
mActivity = activity; mActivity = activity;
if (!sInitializedPath) {
sInitializedPath = true;
Apple2Preferences.CURRENT_DISK_PATH.load(mActivity);
}
LayoutInflater inflater = (LayoutInflater) mActivity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); LayoutInflater inflater = (LayoutInflater) mActivity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
mDisksView = inflater.inflate(R.layout.activity_disks, null, false); mDisksView = inflater.inflate(R.layout.activity_disks, null, false);
@ -150,6 +145,10 @@ public class Apple2DisksMenu implements Apple2MenuView {
if (isShowing()) { if (isShowing()) {
return; return;
} }
if (!sInitializedPath) {
sInitializedPath = true;
Apple2Preferences.CURRENT_DISK_PATH.load(mActivity);
}
dynamicSetup(); dynamicSetup();
mActivity.pushApple2View(this); mActivity.pushApple2View(this);
} }
@ -190,8 +189,8 @@ public class Apple2DisksMenu implements Apple2MenuView {
try { try {
JSONArray jsonArray = new JSONArray(pathStackJSON); JSONArray jsonArray = new JSONArray(pathStackJSON);
for (int i = 0, count = jsonArray.length(); i < count; i++) { for (int i = 0, count = jsonArray.length(); i < count; i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i); String pathComponent = jsonArray.getString(i);
mPathStack.add(jsonObject.toString()); mPathStack.add(pathComponent);
} }
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();