diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-05-01 08:22:16 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-05-01 08:22:16 (GMT) |
commit | 50024d32bc40541f128d80139e58494663f955b4 (patch) | |
tree | 524fd9a785cae1d11184f35d6298143c35156ed9 /src | |
parent | 2c3f266c740dda76b5c96acb874eff85d6adffc9 (diff) | |
download | fluxbox-50024d32bc40541f128d80139e58494663f955b4.zip fluxbox-50024d32bc40541f128d80139e58494663f955b4.tar.bz2 |
save timestamp for non-existent menu file, in case user creates one
Diffstat (limited to 'src')
-rw-r--r-- | src/Screen.cc | 3 | ||||
-rw-r--r-- | src/fluxbox.cc | 15 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index cb6faf2..f06fc43 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -1536,6 +1536,9 @@ void BScreen::initMenu() { | |||
1536 | restart_fb); | 1536 | restart_fb); |
1537 | m_rootmenu->insert(_FB_XTEXT(Menu, Exit, "Exit", "Exit command"), | 1537 | m_rootmenu->insert(_FB_XTEXT(Menu, Exit, "Exit", "Exit command"), |
1538 | exit_fb); | 1538 | exit_fb); |
1539 | // still save the menu filename, in case it becomes valid later | ||
1540 | if (!fb->getMenuFilename().empty()) | ||
1541 | fb->saveMenuFilename(fb->getMenuFilename().c_str()); | ||
1539 | } | 1542 | } |
1540 | 1543 | ||
1541 | m_rootmenu->updateMenu(); | 1544 | m_rootmenu->updateMenu(); |
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index a6ce035..300d683 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -1476,10 +1476,7 @@ bool Fluxbox::menuTimestampsChanged() const { | |||
1476 | 1476 | ||
1477 | time_t timestamp = FbTk::FileUtil::getLastStatusChangeTimestamp((*it)->filename.c_str()); | 1477 | time_t timestamp = FbTk::FileUtil::getLastStatusChangeTimestamp((*it)->filename.c_str()); |
1478 | 1478 | ||
1479 | if (timestamp >= 0) { | 1479 | if (timestamp != (*it)->timestamp) |
1480 | if (timestamp != (*it)->timestamp) | ||
1481 | return true; | ||
1482 | } else | ||
1483 | return true; | 1480 | return true; |
1484 | } | 1481 | } |
1485 | 1482 | ||
@@ -1529,14 +1526,12 @@ void Fluxbox::saveMenuFilename(const char *filename) { | |||
1529 | if (! found) { | 1526 | if (! found) { |
1530 | time_t timestamp = FbTk::FileUtil::getLastStatusChangeTimestamp(filename); | 1527 | time_t timestamp = FbTk::FileUtil::getLastStatusChangeTimestamp(filename); |
1531 | 1528 | ||
1532 | if (timestamp >= 0) { | 1529 | MenuTimestamp *ts = new MenuTimestamp; |
1533 | MenuTimestamp *ts = new MenuTimestamp; | ||
1534 | 1530 | ||
1535 | ts->filename = filename; | 1531 | ts->filename = filename; |
1536 | ts->timestamp = timestamp; | 1532 | ts->timestamp = timestamp; |
1537 | 1533 | ||
1538 | m_menu_timestamps.push_back(ts); | 1534 | m_menu_timestamps.push_back(ts); |
1539 | } | ||
1540 | } | 1535 | } |
1541 | } | 1536 | } |
1542 | 1537 | ||