aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-08-08 11:00:13 (GMT)
committerPaul Tagliamonte <paultag@fluxbox.org>2012-04-07 02:13:12 (GMT)
commit588afe41b08df6aa5e8f2f2d92431ad600ecc7db (patch)
treebd2cfa4e0ce061b7d00ab7187f8cd105f4333420
parent1e35020b456e164868389ae10742bd0685a40f1b (diff)
downloadfluxbox_paul-588afe41b08df6aa5e8f2f2d92431ad600ecc7db.zip
fluxbox_paul-588afe41b08df6aa5e8f2f2d92431ad600ecc7db.tar.bz2
Don't create a new lua state upon reconfigure
As we integrate lua more and more into the core of fluxbox, it's going to progressively harder to update all things that reference to the old state. Furthermore, I would like to completely drop the reconfiguration at some point, after I'm finished with making sure that all resources use the modifiedSig signal to update automatically.
-rw-r--r--src/fluxbox.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 9e40f1f..f655f7e 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -1233,9 +1233,6 @@ BScreen *Fluxbox::findScreen(int id) {
1233} 1233}
1234 1234
1235void Fluxbox::reconfigure() { 1235void Fluxbox::reconfigure() {
1236 std::auto_ptr<FbTk::Lua> t = m_l;
1237 m_l.reset(new Lua);
1238 m_resourcemanager.setLua(*m_l);
1239 load_rc(); 1236 load_rc();
1240 STLUtil::forAll(m_screen_list, mem_fun(&BScreen::reconfigure)); 1237 STLUtil::forAll(m_screen_list, mem_fun(&BScreen::reconfigure));
1241} 1238}