diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-06-19 17:21:34 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-06-19 17:21:34 +0000 |
| commit | a3fb899bc1ae08cac5050791c9958437184b55e0 (patch) | |
| tree | 444647a2e316a13162f20041634fce7f4bf7f674 /src/widgets/sp-color-notebook.cpp | |
| parent | changes_2013_05_22a.patch: (diff) | |
| parent | Fix my own mis-credit and some symbols labels (diff) | |
| download | inkscape-a3fb899bc1ae08cac5050791c9958437184b55e0.tar.gz inkscape-a3fb899bc1ae08cac5050791c9958437184b55e0.zip | |
merge from trunk (r12380)
(bzr r11668.1.72)
Diffstat (limited to 'src/widgets/sp-color-notebook.cpp')
| -rw-r--r-- | src/widgets/sp-color-notebook.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp index f75521e2c..c709e9775 100644 --- a/src/widgets/sp-color-notebook.cpp +++ b/src/widgets/sp-color-notebook.cpp @@ -651,8 +651,11 @@ void ColorNotebook::_updateRgbaEntry( const SPColor& color, gfloat alpha ) void ColorNotebook::_setCurrentPage(int i) { - gtk_notebook_set_current_page (GTK_NOTEBOOK (_book), i); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(_buttons[i]), TRUE); + gtk_notebook_set_current_page(GTK_NOTEBOOK(_book), i); + + if (_buttons && _trackerList && (static_cast<size_t>(i) < _trackerList->len) ) { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(_buttons[i]), TRUE); + } } void ColorNotebook::_buttonClicked(GtkWidget *widget, SPColorNotebook *colorbook) |