diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-02 20:55:33 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-02 20:55:33 +0000 |
| commit | d968824110c032494b31f04cdb2551324e737bde (patch) | |
| tree | 871bde7f374d570def4e16f3ae534defad20c044 /src | |
| parent | cf2a7295b626de37dfb4c7f1f34c6d3ab244a474 (diff) | |
| parent | bfa0eb6afdd82934a19b1d31407d2956235292c3 (diff) | |
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/log.h | 1 | ||||
| -rw-r--r-- | src/wx/film_viewer.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/log.h b/src/lib/log.h index 2e5d69a08..298b425cd 100644 --- a/src/lib/log.h +++ b/src/lib/log.h @@ -34,6 +34,7 @@ class Log { public: Log (); + virtual ~Log () {} enum Level { STANDARD = 0, diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 79de49406..a82132358 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -43,6 +43,7 @@ public: ThumbPanel (wxPanel* parent, shared_ptr<Film> film) : wxPanel (parent) , _film (film) + , _index (0) , _frame_rebuild_needed (false) , _composition_needed (false) {} |