png img proxy fixes, speed zoom segv fix, colapse ins 1frm silence undo, repair rende...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / dbwindow.C

diff --git a/cinelerra-5.1/cinelerra/dbwindow.C b/cinelerra-5.1/cinelerra/dbwindow.C
index c19b581e37e2a9763c9f264a053cd0af0a3852df..780fc650b4f5ae172110571886bf66319f43784e 100644 (file)
--- a/cinelerra-5.1/cinelerra/dbwindow.C
+++ b/cinelerra-5.1/cinelerra/dbwindow.C
@@ -87,8 +87,8 @@ stop()
                if( gui ) gui->set_done(1);
                window_lock->unlock();
                Thread::cancel();
-               Thread::join();
        }
+       Thread::join();
 }
 
 void DbWindow::
@@ -167,7 +167,7 @@ handle_event()
 
 DbWindowText::
 DbWindowText(DbWindowGUI *gui, int x, int y, int w)
- : BC_TextBox(x, y, w, 1, "") 
+ : BC_TextBox(x, y, w, 1, "")
 {
        this->gui = gui;
 }
@@ -588,7 +588,7 @@ DbWindowGUI(DbWindow *dwindow)
        search_column_titles[col_id] = _("Id");
        search_column_titles[col_length] = _("length");
        search_column_titles[col_source] = _("Source");
-       search_column_titles[col_title] = _("Title");
+       search_column_titles[col_title] = C_("Title");
        search_column_titles[col_start_time] = _("Start time");
        search_column_titles[col_access_time] = _("Access time");
        search_column_titles[col_access_count] = _("count");
@@ -846,7 +846,7 @@ cmpr_##nm(const void *a, const void *b) { \
   return n; \
 }
 
-extern long timezone;
+extern long cin_timezone;
 
 CmprFn(id_dn, ap->id - bp->id)
 CmprFn(id_up, bp->id - ap->id)
@@ -860,8 +860,8 @@ CmprFn(Title_dn, strcasecmp(ap->title, bp->title))
 CmprFn(title_dn, strcmp(ap->title, bp->title))
 CmprFn(Title_up, strcasecmp(bp->title, ap->title))
 CmprFn(title_up, strcmp(bp->title, ap->title))
-CmprFn(start_time_dn, fmod(ap->start_time-timezone,24*3600) - fmod(bp->start_time-timezone,24*3600))
-CmprFn(start_time_up, fmod(bp->start_time-timezone,24*3600) - fmod(ap->start_time-timezone,24*3600))
+CmprFn(start_time_dn, fmod(ap->start_time-cin_timezone,24*3600) - fmod(bp->start_time-cin_timezone,24*3600))
+CmprFn(start_time_up, fmod(bp->start_time-cin_timezone,24*3600) - fmod(ap->start_time-cin_timezone,24*3600))
 CmprFn(access_time_dn, ap->access_time - bp->access_time)
 CmprFn(access_time_up, bp->access_time - ap->access_time)
 CmprFn(access_count_dn, ap->access_count - bp->access_count)