summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/fluxbox.cc14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index bdc207c..821bc78 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.29 2002/02/07 14:23:01 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.30 2002/02/10 11:18:17 fluxgen Exp $
26 26
27//Use some GNU extensions 27//Use some GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -1706,7 +1706,8 @@ void Fluxbox::shutdown(void) {
1706 1706
1707 LinkedListIterator<BScreen> it(screenList); 1707 LinkedListIterator<BScreen> it(screenList);
1708 for (; it.current(); it++) 1708 for (; it.current(); it++)
1709 it.current()->shutdown(); 1709 if(it.current())
1710 it.current()->shutdown();
1710 1711
1711 XSync(getXDisplay(), False); 1712 XSync(getXDisplay(), False);
1712 1713
@@ -1975,14 +1976,8 @@ void Fluxbox::load_rc(void) {
1975} 1976}
1976 1977
1977void Fluxbox::load_rc(BScreen *screen) { 1978void Fluxbox::load_rc(BScreen *screen) {
1978 #ifdef DEBUG
1979 cerr<<"Loading BScreen(this="<<screen<<") num="<<screen->getScreenNumber()<<"------------"<<endl;
1980 #endif
1981 //get resource filename 1979 //get resource filename
1982 auto_ptr<char> dbfile(getRcFilename()); 1980 auto_ptr<char> dbfile(getRcFilename());
1983 #ifdef DEBUG
1984 cerr<<__FILE__<<"("<<__LINE__<<"): dbfile="<<dbfile.get()<<endl;
1985 #endif
1986 if (dbfile.get()) { 1981 if (dbfile.get()) {
1987 if (!m_screen_rm.load(dbfile.get())) { 1982 if (!m_screen_rm.load(dbfile.get())) {
1988 cerr<<"Faild to load database:"<<dbfile.get()<<endl; 1983 cerr<<"Faild to load database:"<<dbfile.get()<<endl;
@@ -2207,9 +2202,6 @@ void Fluxbox::load_rc(BScreen *screen) {
2207 screen->saveTabHeight(512); 2202 screen->saveTabHeight(512);
2208 else if (screen->getTabHeight()<0) 2203 else if (screen->getTabHeight()<0)
2209 screen->saveTabHeight(5); 2204 screen->saveTabHeight(5);
2210 #ifdef DEBUG
2211 cerr<<__FILE__<<"("<<__LINE__<<"---------------------- LOADING DONE"<<endl;
2212 #endif
2213} 2205}
2214 2206
2215void Fluxbox::loadRootCommand(BScreen *screen) { 2207void Fluxbox::loadRootCommand(BScreen *screen) {