From 8a1df227c1aaa3984a8e6c1accc6de2a76eed6a5 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Tue, 18 Aug 2020 04:50:51 +0800
Subject: [PATCH] Fix monitor flush

---
 .../java/be/mygod/vpnhotspot/net/monitor/IpLinkMonitor.kt   | 3 +--
 .../be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt   | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpLinkMonitor.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpLinkMonitor.kt
index 918e00a4..e6c8e42a 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpLinkMonitor.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpLinkMonitor.kt
@@ -16,8 +16,7 @@ class IpLinkMonitor private constructor() : IpMonitor() {
             if (monitor == null) {
                 monitor = IpLinkMonitor()
                 instance = monitor
-            }
-            monitor.flushAsync()
+            } else monitor.flushAsync()
         }
         fun unregisterCallback(owner: Any) = synchronized(this) {
             if (callbacks.remove(owner) == null || callbacks.isNotEmpty()) return@synchronized
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt
index 3ab992ff..d92f473a 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt
@@ -28,9 +28,11 @@ class IpNeighbourMonitor private constructor() : IpMonitor() {
             if (monitor == null) {
                 monitor = IpNeighbourMonitor()
                 instance = monitor
-                monitor.flushAsync()
                 null
-            } else monitor.neighbours.values
+            } else {
+                monitor.flushAsync()
+                monitor.neighbours.values
+            }
         }?.let { callback.onIpNeighbourAvailable(it) }
         fun unregisterCallback(callback: Callback) = synchronized(callbacks) {
             if (callbacks.remove(callback) == null) return@synchronized