projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
34f26bd
)
Fix bugs with default container configuration.
author
Carl Hetherington
<cth@carlh.net>
Thu, 29 Jun 2017 12:21:36 +0000
(13:21 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 29 Jun 2017 12:21:36 +0000
(13:21 +0100)
src/wx/config_dialog.cc
patch
|
blob
|
history
diff --git
a/src/wx/config_dialog.cc
b/src/wx/config_dialog.cc
index 8dd6cab68503a7cdd4d7e1781a89585e8b594300..233766cbaddd27395ea77033f5c872441a01fb3c 100644
(file)
--- a/
src/wx/config_dialog.cc
+++ b/
src/wx/config_dialog.cc
@@
-615,11
+615,15
@@
private:
{
Config* config = Config::instance ();
{
Config* config = Config::instance ();
- vector<Ratio const *>
ratios = Ratio::all
();
- for (size_t i = 0; i <
ratio
s.size(); ++i) {
- if (
ratio
s[i] == config->default_container ()) {
+ vector<Ratio const *>
containers = Ratio::containers
();
+ for (size_t i = 0; i <
container
s.size(); ++i) {
+ if (
container
s[i] == config->default_container ()) {
_container->SetSelection (i);
}
_container->SetSelection (i);
}
+ }
+
+ vector<Ratio const *> ratios = Ratio::all ();
+ for (size_t i = 0; i < ratios.size(); ++i) {
if (ratios[i] == config->default_scale_to ()) {
_scale_to->SetSelection (i + 1);
}
if (ratios[i] == config->default_scale_to ()) {
_scale_to->SetSelection (i + 1);
}
@@
-691,7
+695,7
@@
private:
void container_changed ()
{
void container_changed ()
{
- vector<Ratio const *> ratio = Ratio::
all
();
+ vector<Ratio const *> ratio = Ratio::
containers
();
Config::instance()->set_default_container (ratio[_container->GetSelection()]);
}
Config::instance()->set_default_container (ratio[_container->GetSelection()]);
}