Merge branch 'master' into pu/fb-setmode

Origin commit data
------------------
Branch: ni/coolstream
Commit: 49737c5ee2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

.gitignore

@@ -3,6 +3,7 @@ Makefile
 autom4te.cache
 *.in
 aclocal.m4
+compile
 config.*
 configure
 depcomp

.svnignore

@@ -1,12 +0,0 @@
-autom4te.cache
-*.in
-aclocal.m4
-config.*
-configure
-depcomp
-install-sh
-*.pc
-libtool
-ltmain.sh
-missing
-stamp.h1

src/gui/widget/colorchooser.cpp

@@ -158,6 +158,7 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &)
 			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings
 					::TIMING_MENU]);
 
+		int val = (*value[selected]);
 		switch ( msg ) {
 			case CRCInput::RC_down:
 				{
@@ -190,12 +191,12 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &)
 				}
 			case CRCInput::RC_right:
 				{
-					if ((*value[selected]) < 100)
+					if (val < 100)
 					{
-						if ((*value[selected]) < 98)
+						if (val < 98)
-							(*value[selected]) += 2;
+							val += 2;
 						else
-							(*value[selected]) = 100;
+							val = 100;
 
 						paintSlider(x + 10, y + hheight + mheight * selected, value[selected], colorchooser_names[selected], iconnames[selected], true);
 						setColor();
@@ -204,12 +205,12 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &)
 				}
 			case CRCInput::RC_left:
 				{
-					if ((*value[selected]) > 0)
+					if (val > 0)
 					{
-						if ((*value[selected]) > 2)
+						if (val > 2)
-							(*value[selected]) -= 2;
+							val -= 2;
 						else
-							(*value[selected]) = 0;
+							val = 0;
 
 						paintSlider(x + 10, y + hheight + mheight * selected, value[selected], colorchooser_names[selected], iconnames[selected], true);
 						setColor();