From aee854e5d5d062179e37ab9d63970b7d0c6ada87 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Sun, 4 Oct 2020 20:30:06 +0200
Subject: [PATCH] fix: Minor fixes

---
 lib/views/chat_list.dart | 16 ++++++++++------
 linux/CMakeLists.txt     |  8 ++++++++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/views/chat_list.dart b/lib/views/chat_list.dart
index e126b5f..b0aa931 100644
--- a/lib/views/chat_list.dart
+++ b/lib/views/chat_list.dart
@@ -456,12 +456,16 @@ class _ChatListState extends State<ChatList> {
                       ConnectionStatusHeader(),
                       Expanded(
                         child: StreamBuilder(
-                            stream: Matrix.of(context)
-                                .client
-                                .onSync
-                                .stream
-                                .where((s) =>
-                                    s.hasRoomUpdate || s.hasPresenceUpdate),
+                            stream:
+                                Matrix.of(context).client.onSync.stream.where(
+                                      (s) =>
+                                          s.hasRoomUpdate ||
+                                          s.accountData
+                                              .where((a) =>
+                                                  a.type ==
+                                                  MatrixState.userStatusesType)
+                                              .isNotEmpty,
+                                    ),
                             builder: (context, snapshot) {
                               return FutureBuilder<void>(
                                 future: waitForFirstSync(context),
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
index 34af8c5..5e82bb4 100644
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -45,6 +45,14 @@ apply_standard_settings(${BINARY_NAME})
 target_link_libraries(${BINARY_NAME} PRIVATE flutter)
 target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
 add_dependencies(${BINARY_NAME} flutter_assemble)
+# Only the install-generated bundle's copy of the executable will launch
+# correctly, since the resources must in the right relative locations. To avoid
+# people trying to run the unbundled copy, put it in a subdirectory instead of
+# the default top-level location.
+set_target_properties(${BINARY_NAME}
+  PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run"
+)
 
 # Generated plugin build rules, which manage building the plugins and adding
 # them to the application.