nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed invinite loop, patch from Mathias Gumz

Browse source
This commit is contained in:
fluxgen 2004-02-28 10:43:20 +00:00
parent 992caf2ef7
commit bd7c2ecf07
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
util/fbrun/FbRun.cc
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: FbRun.cc,v 1.24 2004/02/25 18:37:47 fluxgen Exp $ // $Id: FbRun.cc,v 1.25 2004/02/28 10:43:20 fluxgen Exp $
#include "FbRun.hh" #include "FbRun.hh"
@ -314,14 +314,15 @@ void FbRun::lastHistoryItem() {
} }
void FbRun::tabCompleteHistory() { void FbRun::tabCompleteHistory() {
if (m_current_history_item == 0) { if (m_current_history_item == 0 || m_history.empty() ) {
XBell(m_display, 0); XBell(m_display, 0);
} else { } else {
unsigned int nr= 0;
int history_item = m_current_history_item - 1; int history_item = m_current_history_item - 1;
string prefix = text().substr(0, cursorPosition()); string prefix = text().substr(0, cursorPosition());
while (history_item != m_current_history_item ) { while (history_item != m_current_history_item && nr++ < m_history.size()) {
if (history_item == -1 ) if (history_item <= -1 )
history_item+= m_history.size(); history_item= m_history.size() - 1;
if (m_history[history_item].find(prefix) == 0) { if (m_history[history_item].find(prefix) == 0) {
m_current_history_item = history_item; m_current_history_item = history_item;
setText(m_history[m_current_history_item]); setText(m_history[m_current_history_item]);