Merge branch 'release'

1 files changed, 9 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/files/SimpleDirChooser.java b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
index e63c09f..1e1296a 100644
--- a/main/src/cgeo/geocaching/files/SimpleDirChooser.java
+++ b/main/src/cgeo/geocaching/files/SimpleDirChooser.java
@@ -57,8 +57,7 @@ public class SimpleDirChooser extends AbstractListActivity {
         fill(currentDir);
 
         okButton = (Button) findViewById(R.id.simple_dir_chooser_ok);
-        okButton.setEnabled(false);
-        okButton.setVisibility(View.INVISIBLE);
+        resetOkButton();
         okButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -132,6 +131,7 @@ public class SimpleDirChooser extends AbstractListActivity {
 
     private void fill(File dir) {
         lastPosition = -1;
+        resetOkButton();
         EditText path = (EditText) findViewById(R.id.simple_dir_chooser_path);
         path.setText(this.getResources().getString(R.string.simple_dir_chooser_current_path) + " " + dir.getAbsolutePath());
         final File[] dirs = dir.listFiles(new DirOnlyFilenameFilter());
@@ -150,6 +150,13 @@ public class SimpleDirChooser extends AbstractListActivity {
         this.setListAdapter(adapter);
     }
 
+    private void resetOkButton() {
+        if (okButton != null) {
+            okButton.setEnabled(false);
+            okButton.setVisibility(View.INVISIBLE);
+        }
+    }
+
     public class FileArrayAdapter extends ArrayAdapter<Option> {
 
         private Context context;