kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-22 22:34:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature/live-remember

Browse Source 
# Conflicts:
#	lang/qet_en.ts
This commit is contained in:
ispyisail
2026-10-05 21:35:52 +13:00
parent 193d177d95 32f7b94594
commit 33f7d27388
15 changed files with 1367 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/qetdiagrameditor.cpp
+3 -1
View File
@@ -1856,8 +1856,10 @@ bool QETDiagramEditor::openAndAddProject(
box.exec();
}
//Not when nobody is there to answer: an assistant opening a
//project in live mode would wait on a window it cannot see
BackupDialog backup_dialog(this);
if (backup_dialog.exec() == QDialog::Accepted)
if (interactive && backup_dialog.exec() == QDialog::Accepted)
{
QString backup_path = filepath_info.absolutePath() + QDir::separator() +
QDateTime::currentDateTime().toString("yyyy-MM-dd-hh-mm") + "_" +