fix #726

radiolog.py

@@ -4589,18 +4589,13 @@ def openNewEntry(self,key=None,callsign=None,formattedLocString=None,fleet=None,
 		# #  this may well be a python bug, but, take steps here to only call it when needed, by
 		# #  comparing its previous value (stored in self.NEWFlags) to the new required value
 		# nf1=self.NEWFlags
-
-		#726 hotfix - uncomment these lines to enable setting flags on every call, below
-		if clueDialog.openDialogCount==0:
-			self.NEWFlags=Qt.WindowTitleHint|Qt.WindowStaysOnTopHint
-		else:
-			self.NEWFlags=Qt.WindowTitleHint
+		# if clueDialog.openDialogCount==0:
+		# 	self.NEWFlags=Qt.WindowTitleHint|Qt.WindowStaysOnTopHint
+		# else:
+		# 	self.NEWFlags=Qt.WindowTitleHint
 		# if nf1!=self.NEWFlags:
 		# 	self.newEntryWindow.setWindowFlags(self.NEWFlags)
 
-		# 726 hotfix: set flags on every call - not sure why this fixes the focus-stealing problem, but it does
-		self.newEntryWindow.setWindowFlags(self.NEWFlags)
-
 		sec=time.time() # epoch seconds, for sorting purposes; not displayed
 		self.newEntryWidget=newEntryWidget(self,sec,formattedLocString,fleet,dev,origLocString,amendFlag,amendRow,isMostRecentForCallsign)
 		# focus rules and timeline:
@@ -4695,7 +4690,9 @@ def openNewEntry(self,key=None,callsign=None,formattedLocString=None,fleet=None,
 			extTeamName=getExtTeamName(callsign)
 			self.newEntryWidget.ui.teamField.setText(callsign)
 			self.newEntryWidget.teamFieldEditingFinished() # check for relay
-			if callsign[0:3]=='KW-':
+			#726 - don't steal focus to the callsign field unless it's also the active widget
+			# if callsign[0:3]=='KW-':
+			if callsign[0:3]=='KW-' and self.newEntryWidget==self.newEntryWindow.ui.tabWidget.currentWidget():
 				self.newEntryWidget.ui.teamField.setFocus()
 				self.newEntryWidget.ui.teamField.selectAll()
 			# rprint('fsLog:')