projects
/
debian
/
openrocket
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rework the loading workflow to be more natural and fix some nasty bugs. Make the...
[debian/openrocket]
/
android
/
src
/
net
/
sf
/
openrocket
/
android
/
rocket
/
WarningDialogFragment.java
diff --git
a/android/src/net/sf/openrocket/android/rocket/WarningDialogFragment.java
b/android/src/net/sf/openrocket/android/rocket/WarningDialogFragment.java
index 07ca6247b92b8bfeca0739ec29f26a248bc78d97..891062bfe0ca28e49cd43cfd537c502a05c93a32 100644
(file)
--- a/
android/src/net/sf/openrocket/android/rocket/WarningDialogFragment.java
+++ b/
android/src/net/sf/openrocket/android/rocket/WarningDialogFragment.java
@@
-15,6
+15,7
@@
public class WarningDialogFragment extends DialogFragment {
WarningDialogFragment frag = new WarningDialogFragment();
\r
Bundle args = new Bundle();
\r
frag.setArguments(args);
\r
WarningDialogFragment frag = new WarningDialogFragment();
\r
Bundle args = new Bundle();
\r
frag.setArguments(args);
\r
+ frag.setCancelable(false);
\r
return frag;
\r
}
\r
\r
return frag;
\r
}
\r
\r
@@
-35,11
+36,7
@@
public class WarningDialogFragment extends DialogFragment {
((OpenRocketLoaderActivity)getActivity()).moveOnToViewer();
\r
}
\r
});
\r
((OpenRocketLoaderActivity)getActivity()).moveOnToViewer();
\r
}
\r
});
\r
- builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
\r
- public void onCancel(DialogInterface dialog) {
\r
- ((OpenRocketLoaderActivity)getActivity()).moveOnToViewer();
\r
- }
\r
- });
\r
- return builder.create();
\r
+ Dialog dialog = builder.create();
\r
+ return dialog;
\r
}
\r
}
\r
}
\r
}
\r