[Scummvm-git-logs] scummvm master -> 55d761a56ae522ad98debc18024a9d121b6bc4a7

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
55d761a56a GUI: Fix Enumeral vs. Non-Enumeral In Conditional GCC Warning.


Commit: 55d761a56ae522ad98debc18024a9d121b6bc4a7
    https://github.com/scummvm/scummvm/commit/55d761a56ae522ad98debc18024a9d121b6bc4a7
Author: D G Turner (digitall at scummvm.org)
Date: 2017-02-28T20:22:38Z

Commit Message:
GUI: Fix Enumeral vs. Non-Enumeral In Conditional GCC Warning.

Changed paths:
    gui/options.cpp


diff --git a/gui/options.cpp b/gui/options.cpp
index f9c0541..d61e940 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -2166,7 +2166,7 @@ void GlobalOptionsDialog::reflowLayout() {
 void GlobalOptionsDialog::setupCloudTab() {
 	int serverLabelPosition = -1; //no override
 #ifdef USE_LIBCURL
-	_selectedStorageIndex = (_storagePopUp ? _storagePopUp->getSelectedTag() : Cloud::kStorageNoneId);
+	_selectedStorageIndex = (_storagePopUp ? _storagePopUp->getSelectedTag() : (uint32) Cloud::kStorageNoneId);
 
 	if (_storagePopUpDesc) _storagePopUpDesc->setVisible(true);
 	if (_storagePopUp) _storagePopUp->setVisible(true);