From 1d72629334fe4712253aa58ca8b5725fab70221f Mon Sep 17 00:00:00 2001
From: mlgd <mlgd17@gmail.com>
Date: Mon, 4 May 2015 15:54:03 +0200
Subject: [PATCH] Fix save config ini file

---
 config/ini.go | 54 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/config/ini.go b/config/ini.go
index 837c9ffe..31fe9b5f 100644
--- a/config/ini.go
+++ b/config/ini.go
@@ -300,21 +300,8 @@ func (c *IniConfigContainer) SaveConfigFile(filename string) (err error) {
 	defer f.Close()
 
 	buf := bytes.NewBuffer(nil)
-	for section, dt := range c.data {
-		// Write section comments.
-		if v, ok := c.sectionComment[section]; ok {
-			if _, err = buf.WriteString(string(bNumComment) + v + lineBreak); err != nil {
-				return err
-			}
-		}
-
-		if section != DEFAULT_SECTION {
-			// Write section name.
-			if _, err = buf.WriteString(string(sectionStart) + section + string(sectionEnd) + lineBreak); err != nil {
-				return err
-			}
-		}
-
+	// Save default section at first place
+	if dt, ok := c.data[DEFAULT_SECTION]; ok {
 		for key, val := range dt {
 			if key != " " {
 				// Write key comments.
@@ -336,6 +323,43 @@ func (c *IniConfigContainer) SaveConfigFile(filename string) (err error) {
 			return err
 		}
 	}
+	// Save named sections
+	for section, dt := range c.data {
+		if section != DEFAULT_SECTION {
+			// Write section comments.
+			if v, ok := c.sectionComment[section]; ok {
+				if _, err = buf.WriteString(string(bNumComment) + v + lineBreak); err != nil {
+					return err
+				}
+			}
+
+			// Write section name.
+			if _, err = buf.WriteString(string(sectionStart) + section + string(sectionEnd) + lineBreak); err != nil {
+				return err
+			}
+
+			for key, val := range dt {
+				if key != " " {
+					// Write key comments.
+					if v, ok := c.keyComment[key]; ok {
+						if _, err = buf.WriteString(string(bNumComment) + v + lineBreak); err != nil {
+							return err
+						}
+					}
+
+					// Write key and value.
+					if _, err = buf.WriteString(key + string(bEqual) + val + lineBreak); err != nil {
+						return err
+					}
+				}
+			}
+
+			// Put a line between sections.
+			if _, err = buf.WriteString(lineBreak); err != nil {
+				return err
+			}
+		}
+	}
 
 	if _, err = buf.WriteTo(f); err != nil {
 		return err