late fixes

pamac/manager.py

@@ -439,6 +439,7 @@ class Handler:
 							transaction.Release()
 							choose_provides()
 							transaction.check_conflicts()
+					if set(transaction_dict.keys()).intersection(transaction.to_add):
 						if transaction.init_transaction(noconflicts = True):
 							for pkgname in transaction.to_add:
 								transaction.Add(pkgname)
@@ -460,11 +461,14 @@ class Handler:
 								if response:
 									transaction.WarningDialog.hide()
 								transaction.t_lock = False
+					else:
+						transaction.t_lock = False
 
 	def on_EraseButton_clicked(self, *arg):
 		global transaction_type
 		global transaction_dict
 		transaction_dict.clear()
+		if transaction_type:
 			transaction_type = None
 			refresh_packages_list()
 

pamac/transaction.py

@@ -112,8 +112,10 @@ def check_conflicts():
 						warning = warning+'\n'
 					warning = warning+name+' will be replaced by '+target.name
 		for name in target.conflicts:
-			if common.format_pkg_name(name) in to_add:
-				to_add.remove(common.format_pkg_name(name))
+			#if common.format_pkg_name(name) in to_add:
+			if name in to_add:
+				#to_add.remove(common.format_pkg_name(name))
+				to_add.remove(name)
 				to_add.remove(target.name)
 				if warning:
 					warning = warning+'\n'
@@ -184,6 +186,7 @@ def handle_error(error):
 def handle_reply(reply):
 	global t_lock
 	t_lock = False
+	Release()
 	ProgressWindow.hide()
 
 def get_updates():