luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-mac-qt6

This commit is contained in:
Kazunari Sekigawa 2022-07-15 16:48:27 +09:00
parent 9cd0017d0d 682cc0e491
commit f42c3cd1e3
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/db/db/dbManager.h
View File

@ -339,7 +339,7 @@ public:
void open ()
{
if (! mp_manager->transacting ()) {
if (mp_manager && ! mp_manager->transacting ()) {
mp_manager->transaction (m_description, m_transaction_id);
}
}

18
src/laybasic/laybasic/layEditable.cc
View File

@ -107,7 +107,9 @@ Editables::del (db::Transaction *transaction)
cancel_edits ();
// this dummy operation will update the screen:
manager ()->queue (this, new db::Op ());
if (manager ()) {
manager ()->queue (this, new db::Op ());
}
for (iterator e = begin (); e != end (); ++e) {
e->del ();
@ -129,7 +131,9 @@ Editables::cut ()
cancel_edits ();
// this dummy operation will update the screen:
manager ()->queue (this, new db::Op ());
if (manager ()) {
manager ()->queue (this, new db::Op ());
}
db::Clipboard::instance ().clear ();
for (iterator e = begin (); e != end (); ++e) {
@ -186,7 +190,9 @@ Editables::transform (const db::DCplxTrans &t, db::Transaction *transaction)
trans_holder->open ();
// this dummy operation will update the screen:
manager ()->queue (this, new db::Op ());
if (manager ()) {
manager ()->queue (this, new db::Op ());
}
for (iterator e = begin (); e != end (); ++e) {
e->transform (t);
@ -208,7 +214,7 @@ Editables::paste ()
cancel_edits ();
// this dummy operation will update the screen:
if (manager ()->transacting ()) {
if (manager () && manager ()->transacting ()) {
manager ()->queue (this, new db::Op ());
}
@ -610,7 +616,9 @@ Editables::end_move (const db::DPoint &p, lay::angle_constraint_type ac, db::Tra
trans_holder->open ();
// this dummy operation will update the screen:
manager ()->queue (this, new db::Op ());
if (manager ()) {
manager ()->queue (this, new db::Op ());
}
for (iterator e = begin (); e != end (); ++e) {
e->end_move (p, ac);