aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-04-29 12:39:45 (GMT)
committerrathnor <rathnor>2003-04-29 12:39:45 (GMT)
commit6b125d1c6046ed1ec1fca92c371f3b7c39449755 (patch)
tree17ba34c6087d6727a9debc82eb48aa111b9ef9fe
parentc8acedf1a8bdad2686eb597cdc0b8608f6672aa4 (diff)
downloadfluxbox-6b125d1c6046ed1ec1fca92c371f3b7c39449755.zip
fluxbox-6b125d1c6046ed1ec1fca92c371f3b7c39449755.tar.bz2
reconfigure fix (setFocusedWindow didn't check if win already focused)
-rw-r--r--ChangeLog2
-rw-r--r--src/fluxbox.cc4
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b82802..10a7117 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.2: 2Changes for 0.9.2:
3*03/04/29: 3*03/04/29:
4 * fix cause of (some?) excessive reconfigures (Simon)
5 fluxbox.cc
4 * fix fbsetbg relative path bug + simplify (Han) 6 * fix fbsetbg relative path bug + simplify (Han)
5 util/fbsetbg 7 util/fbsetbg
6 * Added FbDrawable.hh/cc (Henrik) 8 * Added FbDrawable.hh/cc (Henrik)
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 65defc7..1886aa0 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.124 2003/04/28 13:34:38 rathnor Exp $ 25// $Id: fluxbox.cc,v 1.125 2003/04/29 12:39:45 rathnor Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -2220,6 +2220,8 @@ void Fluxbox::timeout() {
2220 2220
2221// set focused window 2221// set focused window
2222void Fluxbox::setFocusedWindow(FluxboxWindow *win) { 2222void Fluxbox::setFocusedWindow(FluxboxWindow *win) {
2223 // already focused
2224 if (m_focused_window == win) return;
2223 BScreen *old_screen = 0, *screen = 0; 2225 BScreen *old_screen = 0, *screen = 0;
2224 FluxboxWindow *old_win = 0; 2226 FluxboxWindow *old_win = 0;
2225 Toolbar *old_tbar = 0, *tbar = 0; 2227 Toolbar *old_tbar = 0, *tbar = 0;