diff options
| author | Alexander Tkachev | 2016-06-12 11:47:52 +0600 |
|---|---|---|
| committer | Alexander Tkachev | 2016-08-24 16:07:55 +0600 |
| commit | dbafbf25693f13a9a3105379dd2b964095712fce (patch) | |
| tree | 53663ef067cc6aa4f1affdca4e2bba476a8183a2 /backends/cloud/googledrive | |
| parent | 2a2beaebc53ff6ef580a12b986d17147df3f15bc (diff) | |
| download | scummvm-rg350-dbafbf25693f13a9a3105379dd2b964095712fce.tar.gz scummvm-rg350-dbafbf25693f13a9a3105379dd2b964095712fce.tar.bz2 scummvm-rg350-dbafbf25693f13a9a3105379dd2b964095712fce.zip | |
CLOUD: Fix getAccessToken()
KEY and SECRET should now load before getAccessToken() uses them, so it
should work now.
Diffstat (limited to 'backends/cloud/googledrive')
| -rw-r--r-- | backends/cloud/googledrive/googledrivestorage.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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 == "") { |