Merge branch 'master' into windows
This commit is contained in:
commit
8c5cff6091
@ -167,7 +167,7 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s)
|
||||
filenameset = true;
|
||||
}
|
||||
}
|
||||
else if (!filenameset
|
||||
if (!filenameset
|
||||
&& node->property(X_("Filename"))
|
||||
&& node->property(X_("LocalFile"))
|
||||
&& node->property(X_("LocalFile"))->value() == X_("1")
|
||||
@ -181,6 +181,9 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s)
|
||||
filenameset = true;
|
||||
}
|
||||
}
|
||||
if (!filenameset) {
|
||||
invid_path_entry.set_text (X_(""));
|
||||
}
|
||||
}
|
||||
|
||||
l = manage (new Label (_("<b>Settings:</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
|
||||
|
@ -864,7 +864,7 @@ GainMeterBase::update_meters()
|
||||
}
|
||||
}
|
||||
|
||||
void GainMeterBase::color_handler(bool dpi)
|
||||
void GainMeterBase::color_handler(bool /* dpi */)
|
||||
{
|
||||
setup_meters();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user