SHA1 Hash:	3f5ef308feee511345c4dbbcf1713858e3c68e7a
Date:	2008-10-27 15:34:20
User:	drh
Comment:	Fix the web-browser user setting so that it actually works.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/main.c from [1a6ab5a7eb] to [1d28ae7236].

@@ -724,11 +724,10 @@
   if( g.argc==2 ){
     db_must_be_within_tree();
   }else{
     db_open_repository(g.argv[2]);
   }
-  db_close();
 #ifndef __MINGW32__
   /* Unix implementation */
   if( g.argv[1][0]=='u' ){
 #if !defined(__DARWIN__) && !defined(__APPLE__)
     zBrowser = db_get("web-browser", "firefox");
@@ -735,10 +734,11 @@
 #else
     zBrowser = db_get("web-browser", "open");
 #endif
     zBrowserCmd = mprintf("%s http://localhost:%d/ &", zBrowser, iPort);
   }
+  db_close();
   if( cgi_http_server(iPort, zBrowserCmd) ){
     fossil_fatal("unable to listen on TCP socket %d", iPort);
   }
   g.httpIn = stdin;
   g.httpOut = stdout;
@@ -757,8 +757,9 @@
   /* Win32 implementation */
   if( g.argv[1][0]=='u' ){
     zBrowser = db_get("web-browser", "start");
     zBrowserCmd = mprintf("%s http://127.0.0.1:%d/", zBrowser, iPort);
   }
+  db_close();
   win32_http_server(iPort, zBrowserCmd);
 #endif
 }