commit 0b74b84df0208ecf90e9cfff78af3c642693d66f
author Zimuzo Ezeozue <zezeozue@google.com> Wed Apr 29 16:14:53 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 29 16:14:53 2020 +0000
tree 1adc902ff5e889f5a6366b3db6dd7397f897d76e
parent 23dc72fdffa25543c03671cce9029249f4e70c2f
parent 8dd9d46e585ceb5659549bb85b1399fbddce1f5d

Merge "Fix wrong initialization order in FAdviser" into rvc-dev

jni/FuseDaemon.cpp

diff --git a/jni/FuseDaemon.cpp b/jni/FuseDaemon.cpp
index bf67f79..1ff69a0 100644
--- a/jni/FuseDaemon.cpp
+++ b/jni/FuseDaemon.cpp
@@ -129,8 +129,6 @@
     void Close(int fd) { SendMessage(Message::close, fd); }
 
   private:
-    std::thread thread_;
-
     struct Message {
         enum Type { record, close, quit };
         Type type;
@@ -218,8 +216,9 @@
         cv_.notify_one();
     }
 
-    std::queue<Message> queue_;
     std::mutex mutex_;
+    std::thread thread_;
+    std::queue<Message> queue_;
     std::condition_variable cv_;
 
     typedef std::multimap<size_t, int> Sizes;