Author: suokko
Date: Wed May 28 18:36:46 2008
New Revision: 26900

URL: http://svn.gna.org/viewcvs/wesnoth?rev=26900&view=rev
Log:
Fixed filesize check in campaignd

Modified:
    trunk/src/campaign_server/campaign_server.cpp

Modified: trunk/src/campaign_server/campaign_server.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/campaign_server/campaign_server.cpp?rev=26900&r1=26899&r2=26900&view=diff
==============================================================================
--- trunk/src/campaign_server/campaign_server.cpp (original)
+++ trunk/src/campaign_server/campaign_server.cpp Wed May 28 18:36:46 2008
@@ -69,6 +69,8 @@
                        ~campaign_server()
                        {
                                delete input_;
+                               scoped_ostream cfgfile = ostream_file(file_);
+                               write(*cfgfile, cfg_);
                        }
                private:
                        /**
@@ -433,10 +435,11 @@
                                                                
find_translations(*data, *campaign);
 
                                                                
add_license(*data);
-
-                                                               scoped_ostream 
campaign_file = ostream_file(filename);
-                                                               config_writer 
writer(*campaign_file, true, "",compress_level_);
-                                                               
writer.write(*data);
+                                                               {
+                                                                       
scoped_ostream campaign_file = ostream_file(filename);
+                                                                       
config_writer writer(*campaign_file, true, "",compress_level_);
+                                                                       
writer.write(*data);
+                                                               }
 //                                                             
write_compressed(*campaign_file, *data);
 
                                                                
(*campaign)["size"] = lexical_cast<std::string>(
@@ -496,8 +499,10 @@
                                                        add_license(*data);
 
                                                        scoped_ostream 
campaign_file = ostream_file(filename);
-                                                       config_writer 
writer(*campaign_file, true, "",compress_level_);
-                                                       writer.write(*data);
+                                                       {
+                                                               config_writer 
writer(*campaign_file, true, "",compress_level_);
+                                                               
writer.write(*data);
+                                                       }
 //                                                     
write_compressed(*campaign_file, *data);
 
                                                        (*campaign)["size"] = 
lexical_cast<std::string>(
@@ -571,9 +576,13 @@
                                                        if (!scripts.empty()) {
                                                                // Write the 
campaign with changed filenames back to disk
                                                                scoped_ostream 
ostream = ostream_file((*campaign)["filename"]);
-                                                               config_writer 
writer(*ostream, true, "",compress_level_);
-                                                               
writer.write(campaign_file);
+                                                               {
+                                                                       
config_writer writer(*ostream, true, "",compress_level_);
+                                                                       
writer.write(campaign_file);
+                                                               }
 //                                                             
write_compressed(*ostream, campaign_file);
+                                                               
(*campaign)["size"] = lexical_cast<std::string>(
+                                                                               
file_size((*campaign)["filename"]));
 
                                                                
network::send_data(construct_message("The following scripts have been 
validated: " +
                                                                                
        scripts), sock, gzipped);


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to