diff options
| author | corvid <devnull@localhost> | 2014-12-24 20:34:41 +0000 |
|---|---|---|
| committer | corvid <devnull@localhost> | 2014-12-24 20:34:41 +0000 |
| commit | c3437f496d24fe8c2ad674c83ade927cbdc075c4 (patch) | |
| tree | 3fe822b1292346018f0b009d4baed76e9bc90c58 /src/uicmd.cc | |
| parent | 38eb3d87a6c0a15fc28dc694c245de27ad933367 (diff) | |
| parent | 8685e116bdbe7b92c5fdcf685c14cfb976334637 (diff) | |
merge 3.0.4.1 branch
Diffstat (limited to 'src/uicmd.cc')
| -rw-r--r-- | src/uicmd.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/uicmd.cc b/src/uicmd.cc index c849a130..5225be75 100644 --- a/src/uicmd.cc +++ b/src/uicmd.cc @@ -552,10 +552,10 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh, win->box(FL_NO_BOX); CustTabs *DilloTabs = new CustTabs(ww, wh, 16); win->end(); + win->resizable(DilloTabs->wizard()); int focus = 1; new_bw = UIcmd_tab_new(DilloTabs, old_ui, focus); - win->resizable(DilloTabs->wizard()); win->show(); if (old_bw == NULL && prefs.xpos >= 0 && prefs.ypos >= 0) { @@ -682,7 +682,7 @@ static char *UIcmd_find_search_str(const char *str) for (p = 0; p < dList_length(prefs.search_urls); p++) { const char *search = (const char *)dList_nth_data(prefs.search_urls, p); - if (strncasecmp(str, search, len) == 0) { + if (search && strncasecmp(str, search, len) == 0) { prefs.search_url_idx = p; url = UIcmd_make_search_str(str + len + 1); break; @@ -933,7 +933,7 @@ static int UIcmd_save_file_check(const char *name) int ch; ds = dStr_sized_new(128); dStr_sprintf(ds, - "The file:\n %s (%d Bytes)\nalready exists. What do we do?", + "The file:\n %s (%d Bytes)\nalready exists. What do we do?", name, (int)ss.st_size); ch = a_Dialog_choice("Dillo Save: File exists!", ds->str, "Abort", "Continue", "Rename", NULL); |