From dbafbf25693f13a9a3105379dd2b964095712fce Mon Sep 17 00:00:00 2001
From: Alexander Tkachev
Date: Sun, 12 Jun 2016 11:47:52 +0600
Subject: CLOUD: Fix getAccessToken()

KEY and SECRET should now load before getAccessToken() uses them, so it
should work now.
---
 backends/cloud/googledrive/googledrivestorage.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'backends/cloud/googledrive')

diff --git a/backends/cloud/googledrive/googledrivestorage.cpp b/backends/cloud/googledrive/googledrivestorage.cpp
index 5eab071599..76ff1dd7fc 100644
--- a/backends/cloud/googledrive/googledrivestorage.cpp
+++ b/backends/cloud/googledrive/googledrivestorage.cpp
@@ -42,8 +42,8 @@
 namespace Cloud {
 namespace GoogleDrive {
 
-char *GoogleDriveStorage::KEY; //can't use ConfMan there yet, loading it on instance creation/auth
-char *GoogleDriveStorage::SECRET; //TODO: hide these secrets somehow
+char *GoogleDriveStorage::KEY = nullptr; //can't use ConfMan there yet, loading it on instance creation/auth
+char *GoogleDriveStorage::SECRET = nullptr; //TODO: hide these secrets somehow
 
 void GoogleDriveStorage::loadKeyAndSecret() {
 	Common::String k = ConfMan.get("GOOGLE_DRIVE_KEY", "cloud");
@@ -67,6 +67,7 @@ GoogleDriveStorage::GoogleDriveStorage(Common::String code) {
 GoogleDriveStorage::~GoogleDriveStorage() {}
 
 void GoogleDriveStorage::getAccessToken(BoolCallback callback, Common::String code) {
+	if (!KEY || !SECRET) loadKeyAndSecret();
 	bool codeFlow = (code != "");
 
 	if (!codeFlow && _refreshToken == "") {
-- 
cgit v1.2.3