diff options
| author | Ethan Chen <intervigil@gmail.com> | 2013-11-15 19:46:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-11-15 19:46:41 +0000 |
| commit | 27c79417296d3f0c2ce9fa0b1ea71e78e85757ea (patch) | |
| tree | 0c77df7f85aedd1d9792596101af50fd747f8424 | |
| parent | f0ff624a4fe2fd5651ad6b79e02050e0c01acdac (diff) | |
| parent | ce337ecc4fd00ec673a43770e07b6ef96c4542f1 (diff) | |
| download | android_packages_apps_CMFileManager-27c79417296d3f0c2ce9fa0b1ea71e78e85757ea.tar.gz android_packages_apps_CMFileManager-27c79417296d3f0c2ce9fa0b1ea71e78e85757ea.tar.bz2 android_packages_apps_CMFileManager-27c79417296d3f0c2ce9fa0b1ea71e78e85757ea.zip | |
Merge "CMFM: Fix deadlock" into cm-10.2
| -rw-r--r-- | src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java index f17c6459..61aa09e5 100644 --- a/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java +++ b/src/com/cyanogenmod/filemanager/ui/widgets/NavigationView.java @@ -806,6 +806,10 @@ public class NavigationView extends RelativeLayout implements //Check that it is really necessary change the directory if (!reload && this.mCurrentDir != null && this.mCurrentDir.compareTo(fNewDir) == 0) { + synchronized (this.mSync) { + mChangingDir = false; + mSync.notify(); + } return; } |