fix a bug introduced in v0.9.1 where memory threshold would be set to…

… 0 if trim threshold was 0
henderea · Jul 30, 2014 · 3e5e0a9 · 3e5e0a9
1 parent 42aee49
commit 3e5e0a9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -31,6 +31,7 @@ A RubyMotion application for keeping memory usage in check.  Shows up in the men
 * **v0.8.2:** add ability to run Memory Trimming on demand
 * **v0.9:** New experimental feature: auto-threshold.  Designed to automatically adjust your thresholds to the target frequency.  If you try it out, please provide feedback at <https://github.com/henderea/MemoryTamer/issues/4>
 * **v0.9.1:** Make some changes to auto-threshold to hopefully improve it.  If you try it out, please provide feedback at <https://github.com/henderea/MemoryTamer/issues/4>
+* **v0.9.2:** fix a bug introduced in v0.9.1 where memory threshold would be set to 0 if trim threshold was 0
 
 ###Versions (code-signed with developer ID):
 * **v0.3:** <http://memorytamer.s3.amazonaws.com/MemoryTamer-0.3.zip> (Mavericks-only)
@@ -56,3 +57,4 @@ A RubyMotion application for keeping memory usage in check.  Shows up in the men
 * **v0.8.2:** <https://memorytamer.s3.amazonaws.com/MemoryTamer-0.8.2.zip>
 * **v0.9:** <https://memorytamer.s3.amazonaws.com/MemoryTamer-0.9.zip>
 * **v0.9.1:** <https://memorytamer.s3.amazonaws.com/MemoryTamer-0.9.1.zip>
+* **v0.9.2:** <https://memorytamer.s3.amazonaws.com/MemoryTamer-0.9.2.zip>
diff --git a/Rakefile b/Rakefile
@@ -27,8 +27,8 @@ Motion::Project::App.setup do |app|
   app.icon                           = 'Icon.icns'
   app.info_plist['CFBundleIconFile'] = 'Icon.icns'
   app.name                           = 'MemoryTamer'
-  app.version                        = '0.9.1'
-  app.short_version                  = '0.9.1'
+  app.version                        = '0.9.2'
+  app.short_version                  = '0.9.2'
   app.identifier                     = 'us.myepg.MemoryTamer'
   app.info_plist['NSUIElement']      = 1
   app.info_plist['SUFeedURL']        = 'https://raw.githubusercontent.com/henderea/MemoryTamer/master/appcast.xml'

diff --git a/app/app_delegate.rb b/app/app_delegate.rb
@@ -117,7 +117,7 @@ def applicationDidFinishLaunching(notification)
         diff_t = (NSDate.date - @last_trim)
         mem_tweak_default('mem', cfm, dfm, [diff, diff_t + 30].min, 60*10, 60*15, 60*5, 60*10)
         mem_tweak_default('trim_mem', cfm, dtm, diff_t, 60*5, 60*10, 60*3, 60*5)
-        App::Persistence['mem'] = [App::Persistence['mem'], App::Persistence['trim_mem']].min
+        App::Persistence['mem'] = [App::Persistence['mem'], App::Persistence['trim_mem']].min if App::Persistence['trim_mem'] > 0 && App::Persistence['auto_threshold'] != 'off'
         set_mem_display
         if cfm <= dfm && diff >= 60 && diff_t >= 30 && !@freeing
           NSLog "seconds since last full freeing: #{diff}"

diff --git a/appcast.xml b/appcast.xml
@@ -5,6 +5,15 @@
         <link>https://raw.githubusercontent.com/henderea/MemoryTamer/master/appcast.xml</link>
         <description>Most recent changes with links to updates.</description>
         <language>en</language>
+        <item>
+            <title>Version 0.9.2</title>
+            <sparkle:releaseNotesLink>
+                http://releases.io/henderea/MemoryTamer/0.9.2?heading=true
+            </sparkle:releaseNotesLink>
+            <pubDate>Wed, 30 Jul 2014 8:20:00 -0400</pubDate>
+            <enclosure url="http://memorytamer.s3.amazonaws.com/MemoryTamer-0.9.2.zip" sparkle:version="0.9.2" length="4571376" type="application/octet-stream" />
+            <sparkle:minimumSystemVersion>10.7</sparkle:minimumSystemVersion>
+        </item>
         <item>
             <title>Version 0.9.1</title>
             <sparkle:releaseNotesLink>