projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add system information dialog with OpenGL version.
[dcpomatic.git]
/
src
/
wx
/
content_menu.cc
diff --git
a/src/wx/content_menu.cc
b/src/wx/content_menu.cc
index 017d2c659ba97abac31a9b70a9b4b46facb63c7d..e5cadd7942870f90512d57f2320fc1cd2f2e7a88 100644
(file)
--- a/
src/wx/content_menu.cc
+++ b/
src/wx/content_menu.cc
@@
-142,11
+142,11
@@
ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
);
item->Check (dcp->cpl() && dcp->cpl() == i->id());
}
);
item->Check (dcp->cpl() && dcp->cpl() == i->id());
}
- } catch (dcp::DCPReadError) {
+ } catch (dcp::DCPReadError
&
) {
/* The DCP is probably missing */
/* The DCP is probably missing */
- } catch (dcp::KDMDecryptionError) {
+ } catch (dcp::KDMDecryptionError
&
) {
/* We have an incorrect KDM */
/* We have an incorrect KDM */
- } catch (KDMError) {
+ } catch (KDMError
&
) {
/* We have an incorrect KDM */
}
} else {
/* We have an incorrect KDM */
}
} else {
@@
-415,7
+415,9
@@
ContentMenu::ov ()
void
ContentMenu::properties ()
{
void
ContentMenu::properties ()
{
- ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, _content.front ());
+ shared_ptr<Film> film = _film.lock ();
+ DCPOMATIC_ASSERT (film);
+ ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, film, _content.front());
d->ShowModal ();
d->Destroy ();
}
d->ShowModal ();
d->Destroy ();
}