Sfoglia il codice sorgente

frontend: Close rename dialog if name unchanged

Warchamp7 2 settimane fa
parent
commit
84361415ff

+ 4 - 0
frontend/components/VolumeControl.cpp

@@ -491,6 +491,10 @@ void VolumeControl::renameSource()
 			continue;
 		}
 
+		if (name == prevName) {
+			return;
+		}
+
 		OBSSourceAutoRelease sourceTest = obs_get_source_by_name(name.c_str());
 
 		if (sourceTest) {

+ 7 - 1
frontend/widgets/OBSBasic_Transitions.cpp

@@ -562,14 +562,20 @@ void OBSBasic::RenameTransition(OBSSource transition)
 	bool accepted = NameDialog::AskForName(this, QTStr("TransitionNameDlg.Title"), QTStr("TransitionNameDlg.Text"),
 					       name, placeHolderText);
 
-	if (!accepted)
+	if (!accepted) {
 		return;
+	}
+
 	if (name.empty()) {
 		OBSMessageBox::warning(this, QTStr("NoNameEntered.Title"), QTStr("NoNameEntered.Text"));
 		RenameTransition(transition);
 		return;
 	}
 
+	if (name == oldName) {
+		return;
+	}
+
 	source = FindTransition(name.c_str());
 	if (source) {
 		OBSMessageBox::warning(this, QTStr("NameExists.Title"), QTStr("NameExists.Text"));