diff --git a/NetBird.xcodeproj/project.pbxproj b/NetBird.xcodeproj/project.pbxproj index 2ecfa61..40aabcd 100644 --- a/NetBird.xcodeproj/project.pbxproj +++ b/NetBird.xcodeproj/project.pbxproj @@ -929,7 +929,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = NetBird/NetBird.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 16; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = TA739QLA7A; ENABLE_PREVIEWS = YES; @@ -981,7 +981,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = NetBird/NetBird.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 16; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = TA739QLA7A; ENABLE_PREVIEWS = YES; diff --git a/NetBird/Source/App/Views/MainView.swift b/NetBird/Source/App/Views/MainView.swift index 82b60b8..99c9065 100644 --- a/NetBird/Source/App/Views/MainView.swift +++ b/NetBird/Source/App/Views/MainView.swift @@ -242,9 +242,9 @@ struct MainView: View { } } } + .navigationBarTitleDisplayMode(.inline) + .navigationBarHidden(true) } - .navigationBarTitleDisplayMode(.inline) - .navigationBarHidden(true) } .navigationViewStyle(StackNavigationViewStyle()) } diff --git a/NetbirdNetworkExtension/PacketTunnelProvider.swift b/NetbirdNetworkExtension/PacketTunnelProvider.swift index c8b38a8..f7aeeec 100644 --- a/NetbirdNetworkExtension/PacketTunnelProvider.swift +++ b/NetbirdNetworkExtension/PacketTunnelProvider.swift @@ -216,8 +216,11 @@ class PacketTunnelProvider: NEPacketTunnelProvider { // Cancel timeout whether start succeeds or not timeoutWorkItem.cancel() - self?.adapter.isRestarting = false - self?.isRestartInProgress = false + self?.monitorQueue.async { + self?.adapter.isRestarting = false + self?.isRestartInProgress = false + } + if let error = error { AppLogger.shared.log("restartClient: start failed - \(error.localizedDescription)") } else {