Fixed auto profile detection in some cases
see issue 1312
This commit is contained in:
parent
0db92a7f88
commit
a5fec87ad5
@ -443,10 +443,13 @@ DCPProfile* DCPStore::getProfile (Glib::ustring filename) {
|
||||
}
|
||||
|
||||
DCPProfile* DCPStore::getStdProfile(Glib::ustring camShortName) {
|
||||
std::map<Glib::ustring, Glib::ustring>::iterator r = fileStdProfiles.find (camShortName.uppercase());
|
||||
if (r==fileStdProfiles.end()) return NULL;
|
||||
Glib::ustring name2=camShortName.uppercase();
|
||||
|
||||
return getProfile(r->second);
|
||||
// Warning: do NOT use map.find(), since it does not seem to work reliably here
|
||||
for (std::map<Glib::ustring, Glib::ustring>::iterator i=fileStdProfiles.begin();i!=fileStdProfiles.end();i++)
|
||||
if (name2==(*i).first) return getProfile((*i).second);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
bool DCPStore::isValidDCPFileName(Glib::ustring filename) const {
|
||||
|
Loading…
x
Reference in New Issue
Block a user