[Scummvm-git-logs] scummvm master -> 2ab092740719e7420901ae5b20af748db2ef4b22

digitall dgturner at iee.org
Tue Jan 10 07:23:11 CET 2017


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:
2ab0927407 GUI: Suppress Unused Variable Warning For Some Build Configurations.


Commit: 2ab092740719e7420901ae5b20af748db2ef4b22
    https://github.com/scummvm/scummvm/commit/2ab092740719e7420901ae5b20af748db2ef4b22
Author: D G Turner (digitall at scummvm.org)
Date: 2017-01-10T06:27:09Z

Commit Message:
GUI: Suppress Unused Variable Warning For Some Build Configurations.

This fix is not totally clean as it spuriously uses the
serverLabelPosition variable in one case of the preprocessor ifdef
configuration, but with the current structure, this is a simple hack to
fix.

A better solution would be to rewrite some of these functions to remove
some of the preprocessor usage if possible.

Changed paths:
    gui/options.cpp


diff --git a/gui/options.cpp b/gui/options.cpp
index 3f6fc5a..371a949 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -2120,8 +2120,10 @@ void GlobalOptionsDialog::setupCloudTab() {
 #else // USE_SDL_NET
 	if (_runServerButton)
 		_runServerButton->setVisible(false);
-	if (_serverInfoLabel)
+	if (_serverInfoLabel) {
+		_serverInfoLabel->setPos(_serverInfoLabel->getRelX(), serverLabelPosition); // Prevent compiler warning from serverLabelPosition being unused.
 		_serverInfoLabel->setVisible(false);
+	}
 	if (_rootPathButton)
 		_rootPathButton->setVisible(false);
 	if (_rootPath)





More information about the Scummvm-git-logs mailing list