freebsd-ports/x11-wm/fluxbox/files/patch-src-Tab.cc
Norikatsu Shigemura a008ff7c18 o fix crash on sticky windows if compiled with Remember patch
(update patch to -7)
o fix misbehaviour of tabber windows (patch approved by fluxgen)

PR:			ports/50204
Submitted by:		Pav Lucistnik <pav@oook.cz>
Tested by:		Hendrik Scholz <hscholz@raisdorf.net>
Approved by:		maintainer no response (about 2 month)
Patch approved by:	fluxgen (fluxbox developer)
2003-04-11 16:45:18 +00:00

19 lines
947 B
C++

--- src/Tab.cc.orig Tue Feb 25 03:00:22 2003
+++ src/Tab.cc Tue Feb 25 03:01:31 2003
@@ -1011,14 +1011,14 @@
Fluxbox *fluxbox = Fluxbox::instance();
if (m_prev) { //if this have a chain to "the left" (previous tab) then set it's next to this next
m_prev->m_next = m_next;
- if(!m_next && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window
+ if(!m_next && !m_prev->m_prev && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window
m_prev->m_win->setTab(false);
else
tmp = m_prev;
}
if (m_next) { //if this have a chain to "the right" (next tab) then set it's prev to this prev
m_next->m_prev = m_prev;
- if(!m_prev && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window
+ if(!m_prev && !m_next->m_next && !fluxbox->useTabs())//Only two tabs in list, remove tab from remaining window
m_next->m_win->setTab(false);
else
tmp = m_next;