From b31a154e32290706325a3463adac55d8bbe6f0fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?=
 <marta.maria.gorecka@gmail.com>
Date: Tue, 26 Feb 2019 19:31:41 +0100
Subject: [PATCH] Fixed error in detecting dvm-template having different NetVM

when the currect VM is the same as the dvm_template, there should be no
warning

fixes QubesOS/qubes-issues#4844
---
 qubesmanager/settings.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py
index 429ae27..ad2157b 100755
--- a/qubesmanager/settings.py
+++ b/qubesmanager/settings.py
@@ -559,6 +559,11 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
 
         if dispvm == qubesadmin.DEFAULT:
             dispvm = self.vm.property_get_default('default_dispvm')
+
+        if dispvm == self.vm:
+            self.warn_netvm_dispvm.setVisible(False)
+            return
+
         dispvm_netvm = getattr(dispvm, 'netvm', None)
 
         if own_netvm == qubesadmin.DEFAULT: