Mercurial > hg > svapp
comparison framework/MainWindowBase.cpp @ 237:1ebd8e13262d
Fix compile error (bad merge! oops)
author | Chris Cannam |
---|---|
date | Wed, 29 Jun 2011 09:57:36 +0100 |
parents | dd14baa45847 |
children | ecbf3b75c562 |
comparison
equal
deleted
inserted
replaced
236:dd14baa45847 | 237:1ebd8e13262d |
---|---|
1186 } | 1186 } |
1187 | 1187 |
1188 bool loadedTemplate = false; | 1188 bool loadedTemplate = false; |
1189 | 1189 |
1190 if (mode == ReplaceSession) { | 1190 if (mode == ReplaceSession) { |
1191 std::cerr << "SV looking for template " << tplPath << std::endl; | 1191 std::cerr << "SV looking for template " << templateName << std::endl; |
1192 if (templateName != "") { | 1192 if (templateName != "") { |
1193 FileOpenStatus tplStatus = openSessionTemplate(templateName); | 1193 FileOpenStatus tplStatus = openSessionTemplate(templateName); |
1194 if (tplStatus != FileOpenFailed) { | 1194 if (tplStatus != FileOpenFailed) { |
1195 std::cerr << "Template load succeeded" << std::endl; | 1195 std::cerr << "Template load succeeded" << std::endl; |
1196 loadedTemplate = true; | 1196 loadedTemplate = true; |