aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Merge branch 'master' into readline

Browse Source
This commit is contained in:
James Booth 2015-03-03 22:12:32 +00:00
commit 1a493823d4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ui/windows.c
View File

@ -639,20 +639,21 @@ wins_swap(int source_win, int target_win)
{ {
ProfWin *source = g_hash_table_lookup(windows, GINT_TO_POINTER(source_win)); ProfWin *source = g_hash_table_lookup(windows, GINT_TO_POINTER(source_win));
if (source != NULL) { if (source) {
ProfWin *target = g_hash_table_lookup(windows, GINT_TO_POINTER(target_win)); ProfWin *target = g_hash_table_lookup(windows, GINT_TO_POINTER(target_win));
// target window empty // target window empty
if (target == NULL) { if (!target) {
g_hash_table_steal(windows, GINT_TO_POINTER(source_win)); g_hash_table_steal(windows, GINT_TO_POINTER(source_win));
status_bar_inactive(source_win);
g_hash_table_insert(windows, GINT_TO_POINTER(target_win), source); g_hash_table_insert(windows, GINT_TO_POINTER(target_win), source);
status_bar_inactive(source_win);
if (win_unread(source) > 0) { if (win_unread(source) > 0) {
status_bar_new(target_win); status_bar_new(target_win);
} else { } else {
status_bar_active(target_win); status_bar_active(target_win);
} }
if ((wins_get_current_num() == source_win) || (wins_get_current_num() == target_win)) { if (wins_get_current_num() == source_win) {
wins_set_current_by_num(target_win);
ui_switch_win(1); ui_switch_win(1);
} }
return TRUE; return TRUE;